Hello community, here is the log from the commit of package mtr for openSUSE:Factory checked in at 2014-09-03 18:23:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtr (Old) and /work/SRC/openSUSE:Factory/.mtr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtr" Changes: -------- --- /work/SRC/openSUSE:Factory/mtr/mtr.changes 2014-07-29 16:48:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mtr.new/mtr.changes 2014-09-03 20:26:00.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 2 15:12:28 UTC 2014 - kstreit...@novell.com + +- cleaned up by spec-cleaner +- xmtr moved from bin to sbin and use capabilities. Fixes bnc#878729 +- version bump to 0.85_p20140126: + * snapshot taken from Gentoo + * this works with gtk properly +- refreshed patches: + * mtr-0.75-manxmtr.patch + * mtr-0.82-capabilities.patch + +------------------------------------------------------------------- Old: ---- mtr-0.85.tar.gz mtr.gif New: ---- mtr-0.85_p20140126.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtr.spec ++++++ --- /var/tmp/diff_new_pack.kzDxOv/_old 2014-09-03 20:26:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kzDxOv/_new 2014-09-03 20:26:02.000000000 +0200 @@ -17,30 +17,28 @@ Name: mtr +Version: 0.85_p20140126 +Release: 0 Summary: Ping and Traceroute Network Diagnostic Tool License: GPL-2.0 Group: Productivity/Networking/Diagnostic -Version: 0.85 -Release: 0 Url: http://www.BitWizard.nl/mtr - -#DL-URL: ftp://ftp.bitwizard.nl/mtr/ -Source: ftp://ftp.bitwizard.nl/mtr/%name-%version.tar.gz +#Source: ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz +Source: http://dev.gentoo.org/~jer/%{name}-%{version}.tar.bz2 Source1: xmtr.desktop Patch1: mtr-0.75-manmtr.patch Patch2: mtr-0.75-manxmtr.patch Patch3: mtr-0.75-nonvoid.patch Patch4: mtr-0.75-sec_snprintf.patch Patch5: mtr-0.82-capabilities.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: gtk2-devel BuildRequires: libcap-devel BuildRequires: ncurses-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -Icon: mtr.gif -PreReq: permissions +Requires(post): permissions +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mtr is a network diagnostic tool that combines Ping and Traceroute into @@ -53,24 +51,13 @@ %package gtk Summary: Ping and Traceroute Network Diagnostic Tool Group: Productivity/Networking/Diagnostic +Requires: xdg-utils %description gtk Mtr is a network diagnostic tool which combines Ping and Traceroute into one program. This package contains mtr with a GTK interface. You'll find the text mode version in the mtr package. -%define _xorg7libs %_lib -%define _xorg7libs32 lib -%define _xorg7bin bin -%define _xorg7mandir %_mandir -%define _xorg7pixmaps include -%define _xorg7libshare share -%define _xorg7xkb /usr/share/X11/xkb -%define _xorg7termcap /usr/lib/X11/etc -%define _xorg7include /usr/include/xorg -%define _xorg7fonts /usr/share/fonts -%define _xorg7prefix /usr - %prep %setup -q cp mtr.8 xmtr.8 @@ -81,66 +68,58 @@ %patch5 -p1 %build -aclocal -I /usr/share/aclocal -autoconf -automake --foreign -a -# -# GTK version -CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --enable-gtk2 \ - --prefix=%{_xorg7prefix} -make && mv mtr xmtr -make distclean +autoreconf -vi + +export CFLAGS="%{optflags} -fpie -fPIE" +export LDFLAGS="-pie -Wl,-z,relro,-z,now" + +%configure \ + --enable-ipv6 \ + --with-gtk \ + --disable-gtktest +make %{?_smp_mflags} +mv mtr xmtr +make distclean %{?_smp_mflags} # # console version -export CFLAGS="$RPM_OPT_FLAGS -fpie -fPIE" -export LDFLAGS="-pie -Wl,-z,relro,-z,now" -./configure \ - --prefix=/usr \ - --mandir=%{_mandir} \ +%configure \ + --enable-ipv6 \ --without-gtk -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/%{_xorg7bin} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 -make DESTDIR=$RPM_BUILD_ROOT install -install -m 4755 xmtr $RPM_BUILD_ROOT/usr/%{_xorg7bin} -install -m 644 xmtr.8 $RPM_BUILD_ROOT/%{_mandir}/man8 -install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ -install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/xmtr_icon.xpm -install -d -m 755 $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/xmtr_icon.xpm +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}/%{_mandir}/man8 +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -m 4755 xmtr %{buildroot}%{_sbindir} +install -m 644 xmtr.8 %{buildroot}/%{_mandir}/man8 +install -d -m 755 %{buildroot}%{_includedir}/X11/pixmaps/ +install -m 644 img/mtr_icon.xpm %{buildroot}%{_includedir}/X11/pixmaps/xmtr_icon.xpm +install -d -m 755 %{buildroot}%{_datadir}/pixmaps/ +install -m 644 img/mtr_icon.xpm %{buildroot}%{_datadir}/pixmaps/xmtr_icon.xpm %suse_update_desktop_file -i xmtr Network Monitor %files %defattr(-,root,root) %doc AUTHORS COPYING FORMATS NEWS README SECURITY TODO %doc %{_mandir}/man8/mtr.8* -%if 0%{?suse_version} <= 1130 -%verify(not mode) %attr(755,root,dialout) /usr/sbin/mtr -%else -%verify(not mode caps) %attr(750,root,dialout) /usr/sbin/mtr -%endif +%verify(not mode caps) %attr(750,root,dialout) %{_sbindir}/mtr %files gtk %defattr(-,root,root) %doc AUTHORS COPYING FORMATS NEWS README SECURITY TODO %doc %{_mandir}/man8/xmtr.8* -%attr(755,root,root) /usr/%{_xorg7bin}/xmtr -/usr/%{_xorg7pixmaps}/X11/pixmaps -/usr/share/applications/* -/usr/share/pixmaps/* +%verify(not mode caps) %attr(750,root,dialout) %{_sbindir}/xmtr +%{_includedir}/X11/pixmaps +%{_datadir}/applications/* +%{_datadir}/pixmaps/* %post -%if 0%{?suse_version} <= 1130 -%run_permissions -%else -%set_permissions /usr/sbin/mtr -%endif +%set_permissions %{_sbindir}/mtr +%set_permissions %{_sbindir}/xmtr %verifyscript -%verify_permissions -e /usr/sbin/mtr +%verify_permissions -e %{_sbindir}/mtr +%verify_permissions -e %{_sbindir}/xmtr %changelog ++++++ mtr-0.75-manxmtr.patch ++++++ --- /var/tmp/diff_new_pack.kzDxOv/_old 2014-09-03 20:26:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kzDxOv/_new 2014-09-03 20:26:02.000000000 +0200 @@ -1,11 +1,9 @@ ---- - xmtr.8 | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -Index: mtr-0.85/xmtr.8 -=================================================================== ---- mtr-0.85.orig/xmtr.8 -+++ mtr-0.85/xmtr.8 +Common subdirectories: mtr-0.85_p20140126.old/autom4te.cache and mtr-0.85_p20140126/autom4te.cache +Common subdirectories: mtr-0.85_p20140126.old/.git and mtr-0.85_p20140126/.git +Common subdirectories: mtr-0.85_p20140126.old/img and mtr-0.85_p20140126/img +diff -u mtr-0.85_p20140126.old/xmtr.8 mtr-0.85_p20140126/xmtr.8 +--- mtr-0.85_p20140126.old/xmtr.8 2014-09-02 17:04:06.150994889 +0200 ++++ mtr-0.85_p20140126/xmtr.8 2014-09-02 17:03:26.838590899 +0200 @@ -2,11 +2,11 @@ @@ -18,9 +16,9 @@ -.B mtr +.B xmtr [\c - .B \-hvrctglspeniuTP46\c + .B \-BfhvrctglxspQemniuTP46\c ] -@@ -69,7 +69,7 @@ mtr \- a network diagnostic tool +@@ -87,7 +87,7 @@ .SH DESCRIPTION @@ -29,7 +27,7 @@ combines the functionality of the .B traceroute and -@@ -78,9 +78,9 @@ programs in a single network diagnostic +@@ -96,9 +96,9 @@ .PP As @@ -40,8 +38,8 @@ +.B xmtr runs on and .BR HOSTNAME . - by sending packets with purposely low TTLs. It continues to send -@@ -111,7 +111,7 @@ Print the summary of command line argume + by sending packets with purposely low TTLs. It continues to send +@@ -129,7 +129,7 @@ .TP .B \-\-version .br @@ -50,7 +48,7 @@ .TP .B \-r -@@ -119,11 +119,11 @@ Print the installed version of mtr. +@@ -137,11 +137,11 @@ .B \-\-report .br This option puts @@ -64,7 +62,7 @@ will run for the number of cycles specified by the .B \-c option, and then print statistics and exit. -@@ -131,9 +131,9 @@ option, and then print statistics and ex +@@ -149,9 +149,9 @@ \c This mode is useful for generating statistics about network quality. Note that each running instance of @@ -76,7 +74,7 @@ to measure the quality of your network may result in decreased network performance. -@@ -176,7 +176,7 @@ packet size upto that number. +@@ -194,7 +194,7 @@ .B \-\-curses .br Use this option to force @@ -85,7 +83,16 @@ to use the curses based terminal interface (if available). -@@ -196,7 +196,7 @@ that are encoded in the response packets +@@ -204,7 +204,7 @@ + .B \-\-mpls + .br + Use this option to tell +-.B mtr ++.B xmtr + to display information from ICMP extensions for MPLS (RFC 4950) + that are encoded in the response packets. + +@@ -214,7 +214,7 @@ .B \-\-no-dns .br Use this option to force @@ -94,7 +101,7 @@ to display numeric IP numbers and not try to resolve the host names. -@@ -248,10 +248,10 @@ Example: +@@ -266,10 +266,10 @@ .B \-\-gtk .br Use this option to force @@ -107,7 +114,7 @@ was built for this to work. See the GTK+ web page at .B http://www.gtk.org/ for more information about GTK+. -@@ -262,7 +262,7 @@ for more information about GTK+. +@@ -280,7 +280,7 @@ .B \-\-split .br Use this option to set @@ -116,16 +123,7 @@ to spit out a format that is suitable for a split-user interface. .TP -@@ -271,7 +271,7 @@ to spit out a format that is suitable fo - .B \-\-raw - .br - Use this option to tell --.B mtr -+.B xmtr - to use the raw output format. This format is better suited for - archival of the measurement results. It could be parsed to - be presented into any of the other display methods. -@@ -337,7 +337,7 @@ Use IPv6 only. +@@ -398,7 +398,7 @@ Some modern routers give a lower priority to ICMP ECHO packets than to other network traffic. Consequently, the reliability of these routers reported by ++++++ mtr-0.82-capabilities.patch ++++++ --- /var/tmp/diff_new_pack.kzDxOv/_old 2014-09-03 20:26:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kzDxOv/_new 2014-09-03 20:26:02.000000000 +0200 @@ -1,13 +1,8 @@ ---- - configure.ac | 4 ++++ - mtr.c | 15 +++++++++++++++ - 2 files changed, 19 insertions(+) - -Index: mtr-0.85/configure.ac -=================================================================== ---- mtr-0.85.orig/configure.ac -+++ mtr-0.85/configure.ac -@@ -26,6 +26,10 @@ AC_CHECK_HEADERS(socket.h sys/socket.h s +Common subdirectories: mtr-0.85_p20140126.old/autom4te.cache and mtr-0.85_p20140126/autom4te.cache +diff -u mtr-0.85_p20140126.old/configure.ac mtr-0.85_p20140126/configure.ac +--- mtr-0.85_p20140126.old/configure.ac 2014-09-02 16:58:46.951616922 +0200 ++++ mtr-0.85_p20140126/configure.ac 2014-09-02 17:06:50.288651060 +0200 +@@ -26,6 +26,10 @@ AC_CHECK_LIB(termcap, tgetent) AC_CHECK_LIB(tinfo, tgetent) @@ -18,12 +13,13 @@ AC_CHECK_FUNC(initscr, , AC_CHECK_LIB(ncurses, initscr, , AC_CHECK_LIB(curses, initscr, , -Index: mtr-0.85/mtr.c -=================================================================== ---- mtr-0.85.orig/mtr.c -+++ mtr-0.85/mtr.c +Common subdirectories: mtr-0.85_p20140126.old/.git and mtr-0.85_p20140126/.git +Common subdirectories: mtr-0.85_p20140126.old/img and mtr-0.85_p20140126/img +diff -u mtr-0.85_p20140126.old/mtr.c mtr-0.85_p20140126/mtr.c +--- mtr-0.85_p20140126.old/mtr.c 2014-09-02 16:58:46.951616922 +0200 ++++ mtr-0.85_p20140126/mtr.c 2014-09-02 17:06:50.288651060 +0200 @@ -46,6 +46,9 @@ - #endif + #include "asn.h" #include "version.h" +#ifdef HAVE_CAPABILITIES @@ -32,7 +28,7 @@ #ifdef ENABLE_IPV6 #define DEFAULT_AF AF_UNSPEC -@@ -524,6 +527,18 @@ int main(int argc, char **argv) +@@ -530,6 +533,18 @@ exit( EXIT_FAILURE ); } ++++++ xmtr.desktop ++++++ --- /var/tmp/diff_new_pack.kzDxOv/_old 2014-09-03 20:26:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kzDxOv/_new 2014-09-03 20:26:02.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=xmtr +Exec=/usr/bin/xdg-su -c /usr/sbin/xmtr Icon=xmtr_icon Name=Xmtr GenericName=Network Diagnostic Tool -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
