33524 2017-06-01 23:16:29 +0300 Обновить до nethogs-0.8.5 2017-06-02 17:35:23 +0300 1 1 4 Development Sisyphus nethogs unstable all Linux CLOSED FIXED P3 enhancement --- 1 zenin_o mike mike qa-sisyphus oldest_to_newest 163913 0 zenin_o 2017-06-01 23:16:29 +0300 Патчи nethogs-debian-* для текущей версии -0.8.0 частично(?) включены авторами в новую версию -0.8.5: https://github.com/raboof/nethogs/releases Формат вывода тоже исправлен авторами. .spec для -0.8.5 прилагается. .src.rpm: http://hermes.ihep.su:8001/pool/lx/SRPMS/nethogs-0.8.5-alt0.src.rpm Мелкие изменения по замечаниям трудящихся готов добавить. Спасибо. 163914 1 7099 zenin_o 2017-06-01 23:17:43 +0300 Created attachment 7099 .spec.diff 163924 2 7099 zenin_o 2017-06-02 12:03:23 +0300 Comment on attachment 7099 .spec.diff поправка 163925 3 7099 zenin_o 2017-06-02 12:04:08 +0300 Comment on attachment 7099 .spec.diff >--- nethogs.spec.orig 2017-06-01 22:03:18.837808740 +0300 >+++ nethogs.spec 2017-06-01 22:39:34.000000000 +0300 >@@ -1,17 +1,15 @@ > Name: nethogs >-Version: 0.8.0 >-Release: alt3 >+Version: 0.8.5 >+Release: alt0 > > Summary: net top > License: GPL > Group: Monitoring > >-Url: http://nethogs.sourceforge.net >-Source0: http://nethogs.sourceforge.net/%name-%version.tar.gz >+Url: https://github.com/raboof/nethogs >+Source0: %name-%version.tar > Source1: nethogs.control >-Patch0: nethogs-0.8.0-debian-makefile.patch >-Patch1: nethogs-0.8.0-debian-geteuid.patch >-Patch2: nethogs-0.8.0-alt-pid32.patch >+#Patch2: nethogs-0.8.0-alt-pid32.patch > Packager: Michael Shigorin <mike@altlinux.org> > > # Automatically added by buildreq on Tue Apr 07 2009 >@@ -36,17 +34,15 @@ > ewentualnie go zabić. > > %prep >-%setup -n %name >-%patch0 -p0 >-%patch1 -p0 >-%patch2 -p1 >+%setup -n %name-%version >+#%patch2 -p1 > > %build >-%make GCC="g++" CFLAGS="%optflags -I%_includedir/ncurses" >+%make PREFIX=/usr GCC="g++" CFLAGS="%optflags -I%_includedir/ncurses" > > %install >-install -pDm755 %name %buildroot%_sbindir/%name >-install -pDm644 %name.8 %buildroot%_man8dir/%name.8 >+install -pDm755 src/%name %buildroot%_sbindir/%name >+install -pDm644 doc/%name.8 %buildroot%_man8dir/%name.8 > install -pDm755 %SOURCE1 %buildroot%_controldir/%name > > %pre >@@ -57,12 +53,16 @@ > %post_control -s netadmin %name > > %files >-%doc Changelog README >+%doc Changelog README.md > %_sbindir/* > %_man8dir/* > %config %_controldir/%name > > %changelog >+* Thu Jun 01 2017 Oleg Zenin <zenin_o@ihep.ru> 0.8.5-alt0 >+- Makefile and get(e)uid patches (cf. 0.8.0-alt3) appear >+ to have been merged into the upstream. >+ > * Fri Oct 14 2011 Michael Shigorin <mike@altlinux.org> 0.8.0-alt3 > - replaced my kludge with a patch by vx8400/gmail.com (thx!) > 163926 4 7101 zenin_o 2017-06-02 12:06:06 +0300 Created attachment 7101 поправка 163936 5 mike 2017-06-02 17:30:45 +0300 Спасибо! Там ещё BuildRequires: /proc понадобился только для сборки в hasher. 163937 6 repository-robot 2017-06-02 17:35:23 +0300 nethogs-0.8.5-alt1 -> sisyphus: Fri Jun 02 2017 Michael Shigorin <mike@altlinux.org> 0.8.5-alt1 - built for sisyphus (closes: #33524), thanks Oleg! - BR: /proc for tests Thu Jun 01 2017 Oleg Zenin <zenin_o@ihep.ru> 0.8.5-alt0 - Makefile and get(e)uid patches (cf. 0.8.0-alt3) appear to have been merged into the upstream. 7099 2017-06-01 23:17:43 +0300 2017-06-02 12:06:06 +0300 .spec.diff nethogs.spec.diff text/plain 1780 zenin_o LS0tIG5ldGhvZ3Muc3BlYy5vcmlnCTIwMTctMDYtMDEgMjI6MDM6MTguODM3ODA4NzQwICswMzAw CisrKyBuZXRob2dzLnNwZWMJMjAxNy0wNi0wMSAyMjozOTozNC4wMDAwMDAwMDAgKzAzMDAKQEAg LTEsMTcgKzEsMTUgQEAKIE5hbWU6IG5ldGhvZ3MKLVZlcnNpb246IDAuOC4wCi1SZWxlYXNlOiBh bHQzCitWZXJzaW9uOiAwLjguNQorUmVsZWFzZTogYWx0MAogCiBTdW1tYXJ5OiBuZXQgdG9wCiBM aWNlbnNlOiBHUEwKIEdyb3VwOiBNb25pdG9yaW5nCiAKLVVybDogaHR0cDovL25ldGhvZ3Muc291 cmNlZm9yZ2UubmV0Ci1Tb3VyY2UwOiBodHRwOi8vbmV0aG9ncy5zb3VyY2Vmb3JnZS5uZXQvJW5h bWUtJXZlcnNpb24udGFyLmd6CitVcmw6IGh0dHBzOi8vZ2l0aHViLmNvbS9yYWJvb2YvbmV0aG9n cworU291cmNlMDogJW5hbWUtJXZlcnNpb24udGFyCiBTb3VyY2UxOiBuZXRob2dzLmNvbnRyb2wK LVBhdGNoMDogbmV0aG9ncy0wLjguMC1kZWJpYW4tbWFrZWZpbGUucGF0Y2gKLVBhdGNoMTogbmV0 aG9ncy0wLjguMC1kZWJpYW4tZ2V0ZXVpZC5wYXRjaAotUGF0Y2gyOiBuZXRob2dzLTAuOC4wLWFs dC1waWQzMi5wYXRjaAorI1BhdGNoMjogbmV0aG9ncy0wLjguMC1hbHQtcGlkMzIucGF0Y2gKIFBh Y2thZ2VyOiBNaWNoYWVsIFNoaWdvcmluIDxtaWtlQGFsdGxpbnV4Lm9yZz4KIAogIyBBdXRvbWF0 aWNhbGx5IGFkZGVkIGJ5IGJ1aWxkcmVxIG9uIFR1ZSBBcHIgMDcgMjAwOQpAQCAtMzYsMTcgKzM0 LDE1IEBACiBld2VudHVhbG5pZSBnbyB6YWJpxIcuCiAKICVwcmVwCi0lc2V0dXAgLW4gJW5hbWUK LSVwYXRjaDAgLXAwCi0lcGF0Y2gxIC1wMAotJXBhdGNoMiAtcDEKKyVzZXR1cCAtbiAlbmFtZS0l dmVyc2lvbgorIyVwYXRjaDIgLXAxCiAKICVidWlsZAotJW1ha2UgR0NDPSJnKysiIENGTEFHUz0i JW9wdGZsYWdzIC1JJV9pbmNsdWRlZGlyL25jdXJzZXMiCislbWFrZSBQUkVGSVg9L3RtcC91c3Ig R0NDPSJnKysiIENGTEFHUz0iJW9wdGZsYWdzIC1JJV9pbmNsdWRlZGlyL25jdXJzZXMiCiAKICVp bnN0YWxsCi1pbnN0YWxsIC1wRG03NTUgJW5hbWUgJWJ1aWxkcm9vdCVfc2JpbmRpci8lbmFtZQot aW5zdGFsbCAtcERtNjQ0ICVuYW1lLjggJWJ1aWxkcm9vdCVfbWFuOGRpci8lbmFtZS44CitpbnN0 YWxsIC1wRG03NTUgc3JjLyVuYW1lICVidWlsZHJvb3QlX3NiaW5kaXIvJW5hbWUKK2luc3RhbGwg LXBEbTY0NCBkb2MvJW5hbWUuOCAlYnVpbGRyb290JV9tYW44ZGlyLyVuYW1lLjgKIGluc3RhbGwg LXBEbTc1NSAlU09VUkNFMSAlYnVpbGRyb290JV9jb250cm9sZGlyLyVuYW1lCiAKICVwcmUKQEAg LTU3LDEyICs1MywxNiBAQAogJXBvc3RfY29udHJvbCAtcyBuZXRhZG1pbiAlbmFtZQogCiAlZmls ZXMKLSVkb2MgQ2hhbmdlbG9nIFJFQURNRQorJWRvYyBDaGFuZ2Vsb2cgUkVBRE1FLm1kCiAlX3Ni aW5kaXIvKgogJV9tYW44ZGlyLyoKICVjb25maWcgJV9jb250cm9sZGlyLyVuYW1lCiAKICVjaGFu Z2Vsb2cKKyogVGh1IEp1biAwMSAyMDE3IE9sZWcgWmVuaW4gPHplbmluX29AaWhlcC5ydT4gMC44 LjUtYWx0MAorLSBNYWtlZmlsZSBhbmQgZ2V0KGUpdWlkIHBhdGNoZXMgKGNmLiAwLjguMC1hbHQz KSBhcHBlYXIKKyAgdG8gaGF2ZSBiZWVuIG1lcmdlZCBpbnRvIHRoZSB1cHN0cmVhbS4KKwogKiBG cmkgT2N0IDE0IDIwMTEgTWljaGFlbCBTaGlnb3JpbiA8bWlrZUBhbHRsaW51eC5vcmc+IDAuOC4w LWFsdDMKIC0gcmVwbGFjZWQgbXkga2x1ZGdlIHdpdGggYSBwYXRjaCBieSB2eDg0MDAvZ21haWwu Y29tICh0aHghKQogCg== 7101 2017-06-02 12:06:06 +0300 2017-06-02 12:06:06 +0300 поправка nethogs.spec.diff text/plain 1776 zenin_o LS0tIG5ldGhvZ3Muc3BlYy5vcmlnCTIwMTctMDYtMDEgMjI6MDM6MTguODM3ODA4NzQwICswMzAw CisrKyBuZXRob2dzLnNwZWMJMjAxNy0wNi0wMSAyMjozOTozNC4wMDAwMDAwMDAgKzAzMDAKQEAg LTEsMTcgKzEsMTUgQEAKIE5hbWU6IG5ldGhvZ3MKLVZlcnNpb246IDAuOC4wCi1SZWxlYXNlOiBh bHQzCitWZXJzaW9uOiAwLjguNQorUmVsZWFzZTogYWx0MAogCiBTdW1tYXJ5OiBuZXQgdG9wCiBM aWNlbnNlOiBHUEwKIEdyb3VwOiBNb25pdG9yaW5nCiAKLVVybDogaHR0cDovL25ldGhvZ3Muc291 cmNlZm9yZ2UubmV0Ci1Tb3VyY2UwOiBodHRwOi8vbmV0aG9ncy5zb3VyY2Vmb3JnZS5uZXQvJW5h bWUtJXZlcnNpb24udGFyLmd6CitVcmw6IGh0dHBzOi8vZ2l0aHViLmNvbS9yYWJvb2YvbmV0aG9n cworU291cmNlMDogJW5hbWUtJXZlcnNpb24udGFyCiBTb3VyY2UxOiBuZXRob2dzLmNvbnRyb2wK LVBhdGNoMDogbmV0aG9ncy0wLjguMC1kZWJpYW4tbWFrZWZpbGUucGF0Y2gKLVBhdGNoMTogbmV0 aG9ncy0wLjguMC1kZWJpYW4tZ2V0ZXVpZC5wYXRjaAotUGF0Y2gyOiBuZXRob2dzLTAuOC4wLWFs dC1waWQzMi5wYXRjaAorI1BhdGNoMjogbmV0aG9ncy0wLjguMC1hbHQtcGlkMzIucGF0Y2gKIFBh Y2thZ2VyOiBNaWNoYWVsIFNoaWdvcmluIDxtaWtlQGFsdGxpbnV4Lm9yZz4KIAogIyBBdXRvbWF0 aWNhbGx5IGFkZGVkIGJ5IGJ1aWxkcmVxIG9uIFR1ZSBBcHIgMDcgMjAwOQpAQCAtMzYsMTcgKzM0 LDE1IEBACiBld2VudHVhbG5pZSBnbyB6YWJpxIcuCiAKICVwcmVwCi0lc2V0dXAgLW4gJW5hbWUK LSVwYXRjaDAgLXAwCi0lcGF0Y2gxIC1wMAotJXBhdGNoMiAtcDEKKyVzZXR1cCAtbiAlbmFtZS0l dmVyc2lvbgorIyVwYXRjaDIgLXAxCiAKICVidWlsZAotJW1ha2UgR0NDPSJnKysiIENGTEFHUz0i JW9wdGZsYWdzIC1JJV9pbmNsdWRlZGlyL25jdXJzZXMiCislbWFrZSBQUkVGSVg9L3VzciBHQ0M9 ImcrKyIgQ0ZMQUdTPSIlb3B0ZmxhZ3MgLUklX2luY2x1ZGVkaXIvbmN1cnNlcyIKIAogJWluc3Rh bGwKLWluc3RhbGwgLXBEbTc1NSAlbmFtZSAlYnVpbGRyb290JV9zYmluZGlyLyVuYW1lCi1pbnN0 YWxsIC1wRG02NDQgJW5hbWUuOCAlYnVpbGRyb290JV9tYW44ZGlyLyVuYW1lLjgKK2luc3RhbGwg LXBEbTc1NSBzcmMvJW5hbWUgJWJ1aWxkcm9vdCVfc2JpbmRpci8lbmFtZQoraW5zdGFsbCAtcERt NjQ0IGRvYy8lbmFtZS44ICVidWlsZHJvb3QlX21hbjhkaXIvJW5hbWUuOAogaW5zdGFsbCAtcERt NzU1ICVTT1VSQ0UxICVidWlsZHJvb3QlX2NvbnRyb2xkaXIvJW5hbWUKIAogJXByZQpAQCAtNTcs MTIgKzUzLDE2IEBACiAlcG9zdF9jb250cm9sIC1zIG5ldGFkbWluICVuYW1lCiAKICVmaWxlcwot JWRvYyBDaGFuZ2Vsb2cgUkVBRE1FCislZG9jIENoYW5nZWxvZyBSRUFETUUubWQKICVfc2JpbmRp ci8qCiAlX21hbjhkaXIvKgogJWNvbmZpZyAlX2NvbnRyb2xkaXIvJW5hbWUKIAogJWNoYW5nZWxv ZworKiBUaHUgSnVuIDAxIDIwMTcgT2xlZyBaZW5pbiA8emVuaW5fb0BpaGVwLnJ1PiAwLjguNS1h bHQwCistIE1ha2VmaWxlIGFuZCBnZXQoZSl1aWQgcGF0Y2hlcyAoY2YuIDAuOC4wLWFsdDMpIGFw cGVhcgorICB0byBoYXZlIGJlZW4gbWVyZ2VkIGludG8gdGhlIHVwc3RyZWFtLgorCiAqIEZyaSBP Y3QgMTQgMjAxMSBNaWNoYWVsIFNoaWdvcmluIDxtaWtlQGFsdGxpbnV4Lm9yZz4gMC44LjAtYWx0 MwogLSByZXBsYWNlZCBteSBrbHVkZ2Ugd2l0aCBhIHBhdGNoIGJ5IHZ4ODQwMC9nbWFpbC5jb20g KHRoeCEpCiAK