From 1d3b651fb210e8a244688c82d94e2a8951e88e12 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:31:52 +0000 Subject: [PATCH 01/62] auto-import changelog data from whowatch-1.4-0.fdr.2.rh80.src.rpm 1.4-0.fdr.1 - Remove libncurses dependency, and libncurses-devel version dependency 1.4-0.fdr.1 - Initial release. --- .cvsignore | 1 + sources | 1 + whowatch.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 whowatch.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f358d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +whowatch-1.4.tar.gz diff --git a/sources b/sources index e69de29..5caf0bd 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0870155e8b75b99f9954e76fb20f9528 whowatch-1.4.tar.gz diff --git a/whowatch.spec b/whowatch.spec new file mode 100644 index 0000000..2994ebc --- /dev/null +++ b/whowatch.spec @@ -0,0 +1,52 @@ +Name: whowatch +Version: 1.4 +Release: 0.fdr.2.rh80 +Epoch: 0 +Summary: Displays informations about the users currently logged in + +Group: Applications/System +License: GPL +URL: http://wizard.ae.krakow.pl/~mike/ +Source0: http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel + +%description +Whowatch is an interactive console utility that displays informations about +the users currently logged on to the machine, in real time. +Besides standard information (login, tty, host, user's process) you can +see type of login (ie. ssh, telnet). You can also see selected user's +processes tree or all system processes tree. +In the process tree mode there is ability to send INT or KILL signal to +selected process. + +%prep +%setup -q + + +%build +%configure +%{__make} %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +#make install doesn't make the install directories. +%{__mkdir} -p $RPM_BUILD_ROOT/%{_bindir}/ +%{__mkdir} -p $RPM_BUILD_ROOT/%{_mandir}/man1/ +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog README TODO KEYS +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Mon Aug 25 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 +- Remove libncurses dependency, and libncurses-devel version dependency +* Wed Aug 20 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 +- Initial release. + From f8277ec2717b881345f100515373ef1e3498d84b Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:32:13 +0000 Subject: [PATCH 02/62] auto-import whowatch-1.4-0.fdr.2.rh90 from whowatch-1.4-0.fdr.2.rh90.src.rpm --- whowatch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 2994ebc..333a065 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,6 +1,6 @@ Name: whowatch Version: 1.4 -Release: 0.fdr.2.rh80 +Release: 0.fdr.2.rh90 Epoch: 0 Summary: Displays informations about the users currently logged in From 0891de1020c704ea50f1db2625330c3c416fdbca Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:32:21 +0000 Subject: [PATCH 03/62] auto-import whowatch-1.4-0.fdr.2.1 from whowatch-1.4-0.fdr.2.1.src.rpm --- whowatch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 333a065..f6d8c61 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,6 +1,6 @@ Name: whowatch Version: 1.4 -Release: 0.fdr.2.rh90 +Release: 0.fdr.2.1 Epoch: 0 Summary: Displays informations about the users currently logged in From b267bfe1f21ff3614973f82d6d5eb3bdf7e69700 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:32:26 +0000 Subject: [PATCH 04/62] auto-import whowatch-1.4-0.fdr.2.2 from whowatch-1.4-0.fdr.2.2.src.rpm --- whowatch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index f6d8c61..315ae9f 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,6 +1,6 @@ Name: whowatch Version: 1.4 -Release: 0.fdr.2.1 +Release: 0.fdr.2.2 Epoch: 0 Summary: Displays informations about the users currently logged in From 18d0bee2e769004a02249bb50c673d83e99f5e45 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:07:13 +0000 Subject: [PATCH 05/62] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3780cc7..5c04351 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From 2c1e00a221269267cc3466bfe3e8cd2985470e91 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 10 Dec 2004 22:03:12 +0000 Subject: [PATCH 06/62] Bump release, strip off fedora.us prefix and dist tag. --- whowatch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 315ae9f..2ad7a3b 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,6 +1,6 @@ Name: whowatch Version: 1.4 -Release: 0.fdr.2.2 +Release: 2 Epoch: 0 Summary: Displays informations about the users currently logged in From 14b59ba446b61f1455aaaf0ad3c115643b0238bf Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 19:55:54 +0000 Subject: [PATCH 07/62] Mass letter "u", "v" and "w" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs --- whowatch.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index 2ad7a3b..0392c13 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,6 @@ Name: whowatch Version: 1.4 Release: 2 -Epoch: 0 Summary: Displays informations about the users currently logged in Group: Applications/System @@ -9,7 +8,7 @@ License: GPL URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel %description Whowatch is an interactive console utility that displays informations about @@ -38,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO KEYS %{_bindir}/* @@ -47,6 +46,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Aug 25 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 - Remove libncurses dependency, and libncurses-devel version dependency + * Wed Aug 20 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 - Initial release. From 18e00b3c4df683e42ba4ccc2737b53b63ad975cf Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 6 Apr 2005 22:13:52 +0000 Subject: [PATCH 08/62] mass release bump for packages not rebuilt after FC-3-split --- whowatch.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 0392c13..68bfe77 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,6 +1,7 @@ Name: whowatch Version: 1.4 -Release: 2 +Release: 3 + Summary: Displays informations about the users currently logged in Group: Applications/System @@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Aug 25 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 - Remove libncurses dependency, and libncurses-devel version dependency From ed14e28cde410d837505fed77f128b27f34b43ff Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 8 Apr 2005 06:44:32 +0000 Subject: [PATCH 09/62] updated to 1.6 to fix gcc4 errors --- .cvsignore | 2 +- sources | 2 +- whowatch-debian-patches.patch | 538 ++++++++++++++++++++++++++++++++++ whowatch-gcc4.patch | 36 +++ whowatch.spec | 25 +- 5 files changed, 592 insertions(+), 11 deletions(-) create mode 100644 whowatch-debian-patches.patch create mode 100644 whowatch-gcc4.patch diff --git a/.cvsignore b/.cvsignore index f358d9e..8240db7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -whowatch-1.4.tar.gz +whowatch-1.6.0.tar.gz diff --git a/sources b/sources index 5caf0bd..b7dc2f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0870155e8b75b99f9954e76fb20f9528 whowatch-1.4.tar.gz +3eb9934c87a5dcfc146f1d926da51a07 whowatch-1.6.0.tar.gz diff --git a/whowatch-debian-patches.patch b/whowatch-debian-patches.patch new file mode 100644 index 0000000..c8671e4 --- /dev/null +++ b/whowatch-debian-patches.patch @@ -0,0 +1,538 @@ +--- whowatch-1.6.0.orig/src/dialects/linux/proc_plugin.c ++++ whowatch-1.6.0/src/dialects/linux/proc_plugin.c +@@ -6,6 +6,7 @@ + * gives better performance) + */ + #include ++#include + #include "pluglib.h" + #include "whowatch.h" + +@@ -97,7 +98,7 @@ + + static inline void add_to_hash(struct netconn_t *c, int inode) + { +-//dolog(__FUNCTION__ ": inode %d, %s\n",inode, ip_addr(c)); ++//dolog("%s: inode %d, %s\n", __func__, inode, ip_addr(c)); + list_add(&c->n_hash, tcp_hashtable + hash(inode)); + } + +@@ -106,15 +107,15 @@ + struct list_head *h, *tmp; + struct netconn_t *t; + tmp = head + hash(inode); +-//dolog(__FUNCTION__": looking for %d (hash %d)\n", inode, hash(inode)); ++//dolog("%s: looking for %d (hash %d)\n", __func__, inode, hash(inode)); + list_for_each(h, tmp) { + t = list_entry(h, struct netconn_t, n_hash); + if(inode == t->inode) { +-//dolog(__FUNCTION__ ": found [%d]\n", t->inode); ++//dolog("%s: found [%d]\n", __func__, t->inode); + return t; + } + } +-//dolog(__FUNCTION__ ": [%d] not found\n", inode); ++//dolog("%s: [%d] not found\n", __func__, inode); + return 0; + } + +@@ -128,7 +129,7 @@ + t->inode = inode; + add_to_hash(t, inode); + list_add(&t->n_list, &tcp_l); +-dolog(__FUNCTION__": new conn [%d]\n", inode); ++dolog("%s: new conn [%d]\n", __func__, inode); + return t; + } + +@@ -140,21 +141,21 @@ + i = sscanf(s, "%x:%x %x:%x %x", &t.s_addr, &t.s_port, + &t.d_addr, &t.d_port, &t.state); + if(i != 5) return 0; +-//dolog(__FUNCTION__": entering\n"); ++//dolog("%s: entering\n", __func__); + tmp = tcp_find(inode, tcp_hashtable); + if(!tmp) { +-//dolog(__FUNCTION__ ": %d %d %d not found\n", inode, t.s_port, t.d_port); ++//dolog("%s: %d %d %d not found\n", __func__, inode, t.s_port, t.d_port); + + tmp = new_netconn(inode, &t); + return tmp; + } + // t.used = tmp->used = 0; + if(!memcmp((char*)&t + offset,(char*)tmp + offset, sizeof(t) - offset)) { +-dolog(__FUNCTION__ ": %d %d %d %s found, not changed\n", ++dolog("%s: %d %d %d %s found, not changed\n", __func__, + inode, t.s_port, t.d_port, tcp_state[t.state-1]); + return tmp; + } +-dolog(__FUNCTION__ ": %d %d->%d %d->%d found,changed\n", ++dolog("%s: %d %d->%d %d->%d found,changed\n", __func__, + inode, t.s_port, t.d_port, tmp->s_port, tmp->d_port); + + +@@ -184,7 +185,7 @@ + hash_init(tcp_hashtable); + flag = 1; + } +-//dolog(__FUNCTION__ ": reading tcp connections\n"); ++//dolog("%s: reading tcp connections\n", __func__); + if(!(f = fopen("/proc/net/tcp", "r"))) return; + /* skip titles */ + fgets(buf, sizeof buf, f); +@@ -198,7 +199,7 @@ + validate(inode, tmp); + } + fclose(f); +-//dolog(__FUNCTION__ ": done.\n"); ++//dolog("%s: done.\n", __func__); + return; + } + +@@ -225,13 +226,13 @@ + struct netconn_t *t; + unsigned int inode = 0; + if(sscanf(s, "%d", &inode) != 1) return 1; +-//dolog(__FUNCTION__ ": looking for [%d]\n", inode); ++//dolog("%s: looking for [%d]\n", __func__, inode); + t = tcp_find(inode, tcp_hashtable); + if(!t) { +-//dolog(__FUNCTION__ ": %d not found\n", inode); ++//dolog("%s: %d not found\n", __func__, inode); + return 0; + } +-//dolog(__FUNCTION__ ": %d found, printing\n", inode); ++//dolog("%s: %d found, printing\n", __func__, inode); + print_net_conn(t); + return 1; + } +@@ -241,7 +242,7 @@ + { + struct list_head *h; + struct netconn_t *t; +-//dolog(__FUNCTION__": looking for %d (hash %d)\n", inode, hash(inode)); ++//dolog("%s: looking for %d (hash %d)\n", __func__, inode, hash(inode)); + list_for_each(h, &tcp_l) { + t = list_entry(h, struct netconn_t, n_list); + if(t->valid +@@ -269,7 +270,7 @@ + } + if(!count || ticks - count >= 2) { + //write(1, "\a", 1); +-//dolog(__FUNCTION__ " reading tcp conn %d %d\n", ticks, ticks%2); ++//dolog("%s reading tcp conn %d %d\n", __func__, ticks, ticks%2); + read_tcp_conn(); + count = ticks; + +--- whowatch-1.6.0.orig/src/block.c ++++ whowatch-1.6.0/src/block.c +@@ -3,6 +3,7 @@ + * is used. Pre-allocated memory is managed by a bit map. + */ + ++#include + #include "whowatch.h" + + #define USED 1 +@@ -42,10 +43,10 @@ + { + struct _block_tbl_t *tmp; + tmp = calloc(1, sizeof *tmp); +- if(!tmp) prg_exit(__FUNCTION__ ": Cannot allocate memory.\n"); ++ if(!tmp) prg_exit(": Cannot allocate memory.\n"); + tmp->_block_t = calloc(1, size * TBL_SIZE); +-dolog(__FUNCTION__ ":new block(%d) - alloc size = %d\n", nr_blocks, size * TBL_SIZE); +- if(!tmp->_block_t) prg_exit(__FUNCTION__ ": Cannot allocate memory.\n"); ++dolog("%s:new block(%d) - alloc size = %d\n", __func__, nr_blocks, size * TBL_SIZE); ++ if(!tmp->_block_t) prg_exit("Cannot allocate memory.\n"); + list_add(&tmp->head, h); + return tmp; + } +@@ -68,11 +69,11 @@ + } + nr++; + } +- dolog(__FUNCTION__": no empty space, getting new one.\n"); ++ dolog("%s: no empty space, getting new one.\n", __func__); + tmp = new_block(size, h); + i = 0; + FOUND: +- dolog(__FUNCTION__": empty in %d block at %d pos\n", nr, i); ++ dolog("%s: empty in %d block at %d pos\n", __func__, nr, i); + tmp->map |= 1<_block_t + (size * i); + } +@@ -85,12 +86,12 @@ + struct _block_tbl_t *tmp; + struct list_head *t, *p; + t = head->next; +-dolog(__FUNCTION__": entering\n"); ++dolog("%s: entering\n", __func__); + while(t != head) { + tmp = list_entry(t, struct _block_tbl_t, head); + p = t->next; + if(!tmp->map) { +- dolog(__FUNCTION__": empty block found %p\n", tmp); ++ dolog("%s: empty block found %p\n", __func__, tmp); + free(tmp->_block_t); + list_del(&tmp->head); + free(tmp); +@@ -113,12 +114,12 @@ + goto FOUND; + i++; + } +- dolog(__FUNCTION__ ":entry not found - error\n"); ++ dolog("%s:entry not found - error\n", __func__); + return -1; + FOUND: +- dolog(__FUNCTION__": %p pointer found in %d\n", p, i); ++ dolog("%s: %p pointer found in %d\n", __func__, p, i); + tmp->map &= ~(1<<(p - tmp->_block_t)/size); +- dolog(__FUNCTION__": setting map pos %d to zero, map = %x\n", ++ dolog("%s: setting map pos %d to zero, map = %x\n", __func__, + (p - tmp->_block_t)/size, tmp->map); + return 0; + } +--- whowatch-1.6.0.orig/src/help.c ++++ whowatch-1.6.0/src/help.c +@@ -51,7 +51,7 @@ + + static void show_help(void *unused) + { +-dolog(__FUNCTION__":printing help\n"); ++dolog("%s:printing help\n", __func__); + general(); + if(current == &users_list) userwin_help(); + if(current == &proc_win) procwin_help(); +--- whowatch-1.6.0.orig/src/info_box.c ++++ whowatch-1.6.0/src/info_box.c +@@ -66,7 +66,7 @@ + if(_box.wd) return; + set_size(); + _box.wd = newpad(_box.rows, _box.cols); +- if(!_box.wd) prg_exit(__FUNCTION__": cannot allocate memory."); ++ if(!_box.wd) prg_exit("box_create: cannot allocate memory."); + wbkgd(_box.wd, COLOR_PAIR(9)); + werase(_box.wd); + box(_box.wd, ACS_VLINE, ACS_HLINE); +--- whowatch-1.6.0.orig/src/input_box.c ++++ whowatch-1.6.0/src/input_box.c +@@ -127,7 +127,7 @@ + + void clb(char *s) + { +- dolog(__FUNCTION__": in: %s\n", s); ++ dolog("%s: in: %s\n", __func__, s); + } + + /* +--- whowatch-1.6.0.orig/src/menu.c ++++ whowatch-1.6.0/src/menu.c +@@ -74,7 +74,7 @@ + static int pos = TITLE_START; + + t = calloc(1, sizeof *t); +- if(!t) prg_exit(__FUNCTION__": cannot allocate memory."); ++ if(!t) prg_exit("add_submenu: cannot allocate memory."); + t->title = s; + INIT_LIST_HEAD(&t->items); + list_add(&t->l_menu, &menu.submenus); +@@ -101,11 +101,11 @@ + static unsigned short longest; + int len = strlen(i->name);// + strlen(i->descr) + 1; + if(!(t = find_submenu(title))) { +-//dolog(__FUNCTION__ ": cannot find title %s\n", title); ++//dolog("%s: cannot find title %s\n", __func__, title); + return; + } + if(len > longest) longest = len; +-//dolog(__FUNCTION__": %d %d %d\n", longest, strlen(i->descr), t->cols); ++//dolog("%s: %d %d %d\n", __func__, longest, strlen(i->descr), t->cols); + if(longest + strlen(i->descr) + 3 > t->cols) + t->cols = 3 + longest + strlen(i->descr); + if(!t->rows) t->rows = 3; /* make space for a border line */ +@@ -193,7 +193,7 @@ + { + set_size(); + menu.wd = newpad(1, menu.cols); +- if(!menu.wd) prg_exit(__FUNCTION__ ": Cannot allocate memory."); ++ if(!menu.wd) prg_exit("menu_create: Cannot allocate memory."); + wbkgd(menu.wd, COLOR_PAIR(9)); + // overwrite(info_win.wd, menu.wd); + werase(menu.wd); +@@ -276,7 +276,7 @@ + return 1; + } + if(!menu.wd) return 0; +-dolog(__FUNCTION__"submenu_wd %p\n", submenu_wd); ++dolog("%s submenu_wd %p\n", __func__, submenu_wd); + switch(key) { + case KBD_ESC: + menu_destroy(); +@@ -291,7 +291,7 @@ + if(!submenu_show()) return 1; + if(change_item(cur_item->l_submenu.prev)) + highlight_item(cur_submenu, 1); +- dolog(__FUNCTION__": cur item %s\n", cur_item->name); ++ dolog("%s: cur item %s\n", __func__, cur_item->name); + break; + case KBD_UP: + if(!submenu_show()) return 1; +@@ -308,10 +308,10 @@ + menu_destroy(); + break; + default: +-dolog(__FUNCTION__": [%d] skipped\n", key); ++dolog("%s: [%d] skipped\n", __func__, key); + return KEY_HANDLED; + } +-dolog(__FUNCTION__":[%d] accepted\n", key); ++dolog("%s:[%d] accepted\n", __func__, key); + return KEY_HANDLED; + } + +--- whowatch-1.6.0.orig/src/menu_hooks.c ++++ whowatch-1.6.0/src/menu_hooks.c +@@ -9,7 +9,7 @@ + + void m_exit(void) + { +-dolog(__FUNCTION__":entering\n"); ++dolog("%s:entering\n", __func__); + prg_exit(""); + } + void m_details(void) +--- whowatch-1.6.0.orig/src/process.c ++++ whowatch-1.6.0/src/process.c +@@ -275,7 +275,7 @@ + + if(!(key&KBD_CTRL)) return KEY_SKIPPED; + key &= KBD_MASK; +-dolog(__FUNCTION__": %x %x\n", key, 'H'); ++dolog("%s: %x %x\n", __func__, key, 'H'); + + switch(key) { + case 'K': signal = 9; break; +--- whowatch-1.6.0.orig/src/screen.c ++++ whowatch-1.6.0/src/screen.c +@@ -41,7 +41,7 @@ + void win_init(void) + { + curs_buf = realloc(curs_buf, screen_cols * sizeof(chtype)); +- if(!curs_buf) errx(1, __FUNCTION__ ": Cannot allocate memory."); ++ if(!curs_buf) errx(1, "%s: Cannot allocate memory.", __func__); + bzero(curs_buf, sizeof(chtype) * screen_cols); + users_list.rows = screen_rows - RESERVED_LINES - 1; + users_list.cols = screen_cols - 2; +--- whowatch-1.6.0.orig/src/search.c ++++ whowatch-1.6.0/src/search.c +@@ -39,7 +39,7 @@ + /* move the cursor to appropriate line */ + to_line(p, current); + pad_draw(); +-dolog(__FUNCTION__": %d\n", p); ++dolog("%s: %d\n", __func__, p); + } + + +--- whowatch-1.6.0.orig/src/subwin.c ++++ whowatch-1.6.0/src/subwin.c +@@ -67,7 +67,7 @@ + sub_current->offset--; + break; + case 'y': +-dolog(__FUNCTION__": sending %d signal to %d\n" ,signals[sub_current->arrow].sig, cur_pid); ++dolog("%s: sending %d signal to %d\n", __func__, signals[sub_current->arrow].sig, cur_pid); + do_signal(signals[sub_current->arrow].sig, cur_pid); + return KEY_HANDLED; + default: return KEY_SKIPPED; +@@ -116,7 +116,7 @@ + int size = sizeof signals/sizeof (struct signal_t); + char buf[16]; + int i, pid = *(int *) p; +-dolog(__FUNCTION__": pid %d\n", pid); ++dolog("%s: pid %d\n", __func__, pid); + if(pid <= 0) { + title("No valid pid selected"); + return; +@@ -155,11 +155,11 @@ + { + assert(sub_current); + main_pad->wd = newpad(SUBWIN_ROWS, SUBWIN_COLS); +- if(!main_pad->wd) prg_exit(__FUNCTION__ ": cannot create details window."); ++ if(!main_pad->wd) prg_exit("pad_create: cannot create details window."); + set_size(main_pad); + w->offset = w->lines = w->xoffset = 0; + border_wd = newpad(BORDER_ROWS+1, BORDER_COLS+1); +- if(!border_wd) prg_exit(__FUNCTION__ ": cannot create details window."); ++ if(!border_wd) prg_exit("pad_create: cannot create details window."); + wbkgd(border_wd, COLOR_PAIR(8)); + werase(border_wd); + box(border_wd, ACS_VLINE, ACS_HLINE); +@@ -218,7 +218,7 @@ + { + void *p; + assert(sub_current); +-dolog(__FUNCTION__":entering\n"); ++dolog("%s:entering\n", __func__); + if(!main_pad->wd) return; + werase(main_pad->wd); + sub_current->lines = 0; +@@ -226,7 +226,7 @@ + if(sub_current == &sub_info) { + draw_plugin(0); + // pad_refresh(); +-dolog(__FUNCTION__"; info only..skipping draw\n"); ++dolog("%s; info only..skipping draw\n", __func__); + return; + } + p = on_cursor(); +@@ -242,7 +242,7 @@ + draw_plugin(p); + } + else { +-dolog(__FUNCTION__"; only builtin draw\n"); ++dolog("%s; only builtin draw\n", __func__); + sub_current->builtin_draw(p); + } + /* number of data lines probably has changed - adjust offset */ +@@ -316,7 +316,7 @@ + snprintf(dlerr, sizeof dlerr, "%s", dlerror()); + return dlerr; + } +-dolog(__FUNCTION__" dlopen returned %x\n", h); ++dolog("%s dlopen returned %x\n", __func__, h); + /* + * Check if the same plugin has been loaded. + * Plugin's name could be the same but code could be different. +@@ -325,10 +325,10 @@ + */ + for(i = 0; i < sizeof sb/sizeof(struct subwin *); i++) { + if(sb[i]->handle == h) { +-dolog(__FUNCTION__": subwin %d has handle %x\n", i, sb[i]->handle); ++dolog("%s: subwin %d has handle %x\n", __func__, i, sb[i]->handle); + dlclose(h); + dlclose(sb[i]->handle); +-dolog(__FUNCTION__": plugin already loaded in subwin %d, count %d\n", i, i); ++dolog("%s: plugin already loaded in subwin %d, count %d\n", __func__, i, i); + sb[i]->handle = h = 0; + goto AGAIN; + break; +@@ -352,14 +352,14 @@ + if(target->handle) { + int i; + i = dlclose(target->handle); +-dolog(__FUNCTION__": closing prev library: %d %s\n", i, dlerror()); ++dolog("%s: closing prev library: %d %s\n", __func__, i, dlerror()); + } +-dolog(__FUNCTION__": plugin loaded\n"); ++dolog("%s: plugin loaded\n", __func__); + target->handle = h; + target->flags = target->plugin_init(on_cursor()); + return 0; + ERROR: +-dolog(__FUNCTION__": plugin not loaded\n"); ++dolog("%s: plugin not loaded\n", __func__); + snprintf(dlerr, sizeof dlerr, "%s", err); + dlclose(h); + return dlerr; +@@ -398,7 +398,7 @@ + sub_main.plugin_clear = dummy; + sub_main.plugin_cleanup = dummy; + main_pad = calloc(1, sizeof(struct pad_t)); +- if(!main_pad) prg_exit(__FUNCTION__": cannot allocate memory."); ++ if(!main_pad) prg_exit("subwin_init: cannot allocate memory."); + sub_main.arrow = -1; + memcpy(&sub_proc, &sub_main, sizeof(sub_main)); + memcpy(&sub_user, &sub_main, sizeof(sub_main)); +@@ -412,7 +412,7 @@ + sub_current = &sub_user; + /* set builtin plugins */ + builtin_set(); +-dolog(__FUNCTION__": %d %d\n", sub_main.arrow, sub_proc.arrow); ++dolog("%s: %d %d\n", __func__, sub_main.arrow, sub_proc.arrow); + + } + +@@ -442,11 +442,11 @@ + } + default: return KEY_SKIPPED; + } +-dolog(__FUNCTION__": key processed\n"); +-dolog(__FUNCTION__": cur %d, %d %d\n", sub_current->arrow, sub_main.arrow, sub_proc.arrow); ++dolog("%s: key processed\n", __func__); ++dolog("%s: cur %d, %d %d\n", __func__, sub_current->arrow, sub_main.arrow, sub_proc.arrow); + + sub_change(sub_current); +-dolog(__FUNCTION__": cur %d, %d %d\n", sub_current->arrow, sub_main.arrow, sub_proc.arrow); ++dolog("%s: cur %d, %d %d\n", __func__, sub_current->arrow, sub_main.arrow, sub_proc.arrow); + + return KEY_HANDLED; + } +@@ -455,10 +455,10 @@ + { + if(!main_pad->wd) return; + if(sub_current->flags & PERIODIC) { +-dolog(__FUNCTION__": doing plugin (and perhaps builtin) draw\n"); ++dolog("%s: doing plugin (and perhaps builtin) draw\n", __func__); + pad_draw(); + } +-dolog(__FUNCTION__": doing refresh\n"); ++dolog("%s: doing refresh\n", __func__); + pad_refresh(); + } + +--- whowatch-1.6.0.orig/src/user.c ++++ whowatch-1.6.0/src/user.c +@@ -57,7 +57,7 @@ + int i; + struct prot_t *t; + users_list.d_lines += p; +-dolog(__FUNCTION__": dlines %d\n", users_list.d_lines); ++dolog("%s: dlines %d\n", __func__, users_list.d_lines); + for(i = 0; i < sizeof prot_tab/sizeof(struct prot_t); i++){ + t = &prot_tab[i]; + if(strncmp(t->s, name, strlen(t->s))) continue; +@@ -217,7 +217,7 @@ + while((i = read(wtmp_fd, &entry, sizeof entry)) > 0){ + if (i < sizeof entry){ + curses_end(); +- errx(1, __FUNCTION__ ": error reading " WTMP_FILE ); ++ errx(1, "%s: error reading " WTMP_FILE, __func__ ); + } + /* user just logged in */ + #ifdef HAVE_USER_PROCESS +@@ -328,10 +328,10 @@ + void users_init(void) + { + if((wtmp_fd = open(WTMP_FILE ,O_RDONLY)) == -1) +- errx(1, __FUNCTION__ ": cannot open " WTMP_FILE ": %s", ++ errx(1, "%s: cannot open " WTMP_FILE ": %s", __func__, + strerror(errno)); + if(lseek(wtmp_fd, 0, SEEK_END) == -1) +- errx(1, __FUNCTION__ ": cannot seek in " WTMP_FILE ": %s", ++ errx(1, "%s: cannot seek in " WTMP_FILE ": %s", __func__, + strerror(errno)); + users_list.giveme_line = users_list_giveline; + users_list.keys = ulist_key; +--- whowatch-1.6.0.orig/src/whowatch.c ++++ whowatch-1.6.0/src/whowatch.c +@@ -152,7 +152,7 @@ + default: return; + } + SKIP: +-dolog(__FUNCTION__": doing refresh\n"); ++dolog("%s: doing refresh\n", __func__); + wnoutrefresh(main_win); + wnoutrefresh(info_win.wd); + pad_refresh(); +@@ -170,7 +170,7 @@ + *x = win.ws_col; + return; + } +- prg_exit(__FUNCTION__ ": ioctl error: cannot read screen size."); ++ prg_exit(": ioctl error: cannot read screen size."); + } + + static void winch_handler() + diff --git a/whowatch-gcc4.patch b/whowatch-gcc4.patch new file mode 100644 index 0000000..1dfb59c --- /dev/null +++ b/whowatch-gcc4.patch @@ -0,0 +1,36 @@ +diff -urN ../tmp-orig/whowatch-1.6.0/src/process.c ./src/process.c +--- ../tmp-orig/whowatch-1.6.0/src/process.c 2005-03-03 15:58:43.561876676 +0100 ++++ ./src/process.c 2005-03-03 15:58:23.855680335 +0100 +@@ -75,7 +75,7 @@ + memset(z, 0, sizeof *z); + check_line(l); + z->line = l++; +- (struct process *) p->priv = z; ++ p->priv = z; + z->proc = p; + if (*current){ + z->next = *current; +diff -urN ../tmp-orig/whowatch-1.6.0/src/subwin.c ./src/subwin.c +--- ../tmp-orig/whowatch-1.6.0/src/subwin.c 2005-03-03 15:58:43.562876483 +0100 ++++ ./src/subwin.c 2005-03-03 15:58:37.076128545 +0100 +@@ -201,7 +201,7 @@ + static void *p = 0; + static int pid; + if(current == &users_list) +- (char *)p = cursor_user()->name; ++ p = cursor_user()->name; + else { + pid = cursor_pid(); + p = &pid; + +--- whowatch-1.6.0/src/menu.c 2005-04-05 08:37:26.334311640 -0400 ++++ whowatch-1.6.0.new/src/menu.c 2005-04-05 08:28:17.000000000 -0400 +@@ -37,7 +37,7 @@ + static unsigned short item_cursor; + + #define DUMMY_HEAD {0, 0} +-static char *submenus[] = { "File", "View", "Process", "Users", "Help" }; ++static char *submenus[] = { "File", "View", "Process", "Users", "Help", NULL }; + struct item_bind_t { + unsigned short submenu; /* index in the submenus table */ + struct item_t item; diff --git a/whowatch.spec b/whowatch.spec index 68bfe77..f90505e 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,13 +1,14 @@ Name: whowatch -Version: 1.4 -Release: 3 - +Version: 1.6.0 +Release: 1 Summary: Displays informations about the users currently logged in Group: Applications/System License: GPL URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz +Patch0: whowatch-debian-patches.patch +Patch1: whowatch-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,6 +23,8 @@ selected process. %prep %setup -q +%patch0 -p1 -b .debian +%patch1 -p1 -b .gcc4 %build @@ -30,22 +33,26 @@ selected process. %install rm -rf $RPM_BUILD_ROOT -#make install doesn't make the install directories. -%{__mkdir} -p $RPM_BUILD_ROOT/%{_bindir}/ -%{__mkdir} -p $RPM_BUILD_ROOT/%{_mandir}/man1/ -%makeinstall +#make install doesn't work anymore +install -D -m0755 src/whowatch ${RPM_BUILD_ROOT}%{_bindir}/whowatch +install -D -m0644 whowatch.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/whowatch.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO KEYS +%doc AUTHORS COPYING ChangeLog README TODO PLUGINS.readme %{_bindir}/* %{_mandir}/man1/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 07 2005 Adrian Reber - 1.6.0-1 +- Updated to 1.6.0 to fix gcc4 errors +- Added many patches from debian +- Added a patch to fix some gcc4 errors and a segmentation fault + +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Mon Aug 25 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 From 4fb529762376e1dee30f47e43743b3589e7a6bc5 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 2 Mar 2006 21:32:29 +0000 Subject: [PATCH 10/62] Build disabled. Package is without maintainer. --- whowatch.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/whowatch.spec b/whowatch.spec index f90505e..ae103b0 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -22,6 +22,13 @@ In the process tree mode there is ability to send INT or KILL signal to selected process. %prep +cat< Date: Mon, 15 May 2006 10:55:34 +0000 Subject: [PATCH 11/62] remove orphans from devel tree + add a file 'dead.package' as a marker --- .cvsignore | 1 - Makefile | 21 -- dead.package | 0 sources | 1 - whowatch-debian-patches.patch | 538 ---------------------------------- whowatch-gcc4.patch | 36 --- whowatch.spec | 70 ----- 7 files changed, 667 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 whowatch-debian-patches.patch delete mode 100644 whowatch-gcc4.patch delete mode 100644 whowatch.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8240db7..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -whowatch-1.6.0.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 5c04351..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: whowatch -# $Id$ -NAME := whowatch -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources deleted file mode 100644 index b7dc2f8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3eb9934c87a5dcfc146f1d926da51a07 whowatch-1.6.0.tar.gz diff --git a/whowatch-debian-patches.patch b/whowatch-debian-patches.patch deleted file mode 100644 index c8671e4..0000000 --- a/whowatch-debian-patches.patch +++ /dev/null @@ -1,538 +0,0 @@ ---- whowatch-1.6.0.orig/src/dialects/linux/proc_plugin.c -+++ whowatch-1.6.0/src/dialects/linux/proc_plugin.c -@@ -6,6 +6,7 @@ - * gives better performance) - */ - #include -+#include - #include "pluglib.h" - #include "whowatch.h" - -@@ -97,7 +98,7 @@ - - static inline void add_to_hash(struct netconn_t *c, int inode) - { --//dolog(__FUNCTION__ ": inode %d, %s\n",inode, ip_addr(c)); -+//dolog("%s: inode %d, %s\n", __func__, inode, ip_addr(c)); - list_add(&c->n_hash, tcp_hashtable + hash(inode)); - } - -@@ -106,15 +107,15 @@ - struct list_head *h, *tmp; - struct netconn_t *t; - tmp = head + hash(inode); --//dolog(__FUNCTION__": looking for %d (hash %d)\n", inode, hash(inode)); -+//dolog("%s: looking for %d (hash %d)\n", __func__, inode, hash(inode)); - list_for_each(h, tmp) { - t = list_entry(h, struct netconn_t, n_hash); - if(inode == t->inode) { --//dolog(__FUNCTION__ ": found [%d]\n", t->inode); -+//dolog("%s: found [%d]\n", __func__, t->inode); - return t; - } - } --//dolog(__FUNCTION__ ": [%d] not found\n", inode); -+//dolog("%s: [%d] not found\n", __func__, inode); - return 0; - } - -@@ -128,7 +129,7 @@ - t->inode = inode; - add_to_hash(t, inode); - list_add(&t->n_list, &tcp_l); --dolog(__FUNCTION__": new conn [%d]\n", inode); -+dolog("%s: new conn [%d]\n", __func__, inode); - return t; - } - -@@ -140,21 +141,21 @@ - i = sscanf(s, "%x:%x %x:%x %x", &t.s_addr, &t.s_port, - &t.d_addr, &t.d_port, &t.state); - if(i != 5) return 0; --//dolog(__FUNCTION__": entering\n"); -+//dolog("%s: entering\n", __func__); - tmp = tcp_find(inode, tcp_hashtable); - if(!tmp) { --//dolog(__FUNCTION__ ": %d %d %d not found\n", inode, t.s_port, t.d_port); -+//dolog("%s: %d %d %d not found\n", __func__, inode, t.s_port, t.d_port); - - tmp = new_netconn(inode, &t); - return tmp; - } - // t.used = tmp->used = 0; - if(!memcmp((char*)&t + offset,(char*)tmp + offset, sizeof(t) - offset)) { --dolog(__FUNCTION__ ": %d %d %d %s found, not changed\n", -+dolog("%s: %d %d %d %s found, not changed\n", __func__, - inode, t.s_port, t.d_port, tcp_state[t.state-1]); - return tmp; - } --dolog(__FUNCTION__ ": %d %d->%d %d->%d found,changed\n", -+dolog("%s: %d %d->%d %d->%d found,changed\n", __func__, - inode, t.s_port, t.d_port, tmp->s_port, tmp->d_port); - - -@@ -184,7 +185,7 @@ - hash_init(tcp_hashtable); - flag = 1; - } --//dolog(__FUNCTION__ ": reading tcp connections\n"); -+//dolog("%s: reading tcp connections\n", __func__); - if(!(f = fopen("/proc/net/tcp", "r"))) return; - /* skip titles */ - fgets(buf, sizeof buf, f); -@@ -198,7 +199,7 @@ - validate(inode, tmp); - } - fclose(f); --//dolog(__FUNCTION__ ": done.\n"); -+//dolog("%s: done.\n", __func__); - return; - } - -@@ -225,13 +226,13 @@ - struct netconn_t *t; - unsigned int inode = 0; - if(sscanf(s, "%d", &inode) != 1) return 1; --//dolog(__FUNCTION__ ": looking for [%d]\n", inode); -+//dolog("%s: looking for [%d]\n", __func__, inode); - t = tcp_find(inode, tcp_hashtable); - if(!t) { --//dolog(__FUNCTION__ ": %d not found\n", inode); -+//dolog("%s: %d not found\n", __func__, inode); - return 0; - } --//dolog(__FUNCTION__ ": %d found, printing\n", inode); -+//dolog("%s: %d found, printing\n", __func__, inode); - print_net_conn(t); - return 1; - } -@@ -241,7 +242,7 @@ - { - struct list_head *h; - struct netconn_t *t; --//dolog(__FUNCTION__": looking for %d (hash %d)\n", inode, hash(inode)); -+//dolog("%s: looking for %d (hash %d)\n", __func__, inode, hash(inode)); - list_for_each(h, &tcp_l) { - t = list_entry(h, struct netconn_t, n_list); - if(t->valid -@@ -269,7 +270,7 @@ - } - if(!count || ticks - count >= 2) { - //write(1, "\a", 1); --//dolog(__FUNCTION__ " reading tcp conn %d %d\n", ticks, ticks%2); -+//dolog("%s reading tcp conn %d %d\n", __func__, ticks, ticks%2); - read_tcp_conn(); - count = ticks; - ---- whowatch-1.6.0.orig/src/block.c -+++ whowatch-1.6.0/src/block.c -@@ -3,6 +3,7 @@ - * is used. Pre-allocated memory is managed by a bit map. - */ - -+#include - #include "whowatch.h" - - #define USED 1 -@@ -42,10 +43,10 @@ - { - struct _block_tbl_t *tmp; - tmp = calloc(1, sizeof *tmp); -- if(!tmp) prg_exit(__FUNCTION__ ": Cannot allocate memory.\n"); -+ if(!tmp) prg_exit(": Cannot allocate memory.\n"); - tmp->_block_t = calloc(1, size * TBL_SIZE); --dolog(__FUNCTION__ ":new block(%d) - alloc size = %d\n", nr_blocks, size * TBL_SIZE); -- if(!tmp->_block_t) prg_exit(__FUNCTION__ ": Cannot allocate memory.\n"); -+dolog("%s:new block(%d) - alloc size = %d\n", __func__, nr_blocks, size * TBL_SIZE); -+ if(!tmp->_block_t) prg_exit("Cannot allocate memory.\n"); - list_add(&tmp->head, h); - return tmp; - } -@@ -68,11 +69,11 @@ - } - nr++; - } -- dolog(__FUNCTION__": no empty space, getting new one.\n"); -+ dolog("%s: no empty space, getting new one.\n", __func__); - tmp = new_block(size, h); - i = 0; - FOUND: -- dolog(__FUNCTION__": empty in %d block at %d pos\n", nr, i); -+ dolog("%s: empty in %d block at %d pos\n", __func__, nr, i); - tmp->map |= 1<_block_t + (size * i); - } -@@ -85,12 +86,12 @@ - struct _block_tbl_t *tmp; - struct list_head *t, *p; - t = head->next; --dolog(__FUNCTION__": entering\n"); -+dolog("%s: entering\n", __func__); - while(t != head) { - tmp = list_entry(t, struct _block_tbl_t, head); - p = t->next; - if(!tmp->map) { -- dolog(__FUNCTION__": empty block found %p\n", tmp); -+ dolog("%s: empty block found %p\n", __func__, tmp); - free(tmp->_block_t); - list_del(&tmp->head); - free(tmp); -@@ -113,12 +114,12 @@ - goto FOUND; - i++; - } -- dolog(__FUNCTION__ ":entry not found - error\n"); -+ dolog("%s:entry not found - error\n", __func__); - return -1; - FOUND: -- dolog(__FUNCTION__": %p pointer found in %d\n", p, i); -+ dolog("%s: %p pointer found in %d\n", __func__, p, i); - tmp->map &= ~(1<<(p - tmp->_block_t)/size); -- dolog(__FUNCTION__": setting map pos %d to zero, map = %x\n", -+ dolog("%s: setting map pos %d to zero, map = %x\n", __func__, - (p - tmp->_block_t)/size, tmp->map); - return 0; - } ---- whowatch-1.6.0.orig/src/help.c -+++ whowatch-1.6.0/src/help.c -@@ -51,7 +51,7 @@ - - static void show_help(void *unused) - { --dolog(__FUNCTION__":printing help\n"); -+dolog("%s:printing help\n", __func__); - general(); - if(current == &users_list) userwin_help(); - if(current == &proc_win) procwin_help(); ---- whowatch-1.6.0.orig/src/info_box.c -+++ whowatch-1.6.0/src/info_box.c -@@ -66,7 +66,7 @@ - if(_box.wd) return; - set_size(); - _box.wd = newpad(_box.rows, _box.cols); -- if(!_box.wd) prg_exit(__FUNCTION__": cannot allocate memory."); -+ if(!_box.wd) prg_exit("box_create: cannot allocate memory."); - wbkgd(_box.wd, COLOR_PAIR(9)); - werase(_box.wd); - box(_box.wd, ACS_VLINE, ACS_HLINE); ---- whowatch-1.6.0.orig/src/input_box.c -+++ whowatch-1.6.0/src/input_box.c -@@ -127,7 +127,7 @@ - - void clb(char *s) - { -- dolog(__FUNCTION__": in: %s\n", s); -+ dolog("%s: in: %s\n", __func__, s); - } - - /* ---- whowatch-1.6.0.orig/src/menu.c -+++ whowatch-1.6.0/src/menu.c -@@ -74,7 +74,7 @@ - static int pos = TITLE_START; - - t = calloc(1, sizeof *t); -- if(!t) prg_exit(__FUNCTION__": cannot allocate memory."); -+ if(!t) prg_exit("add_submenu: cannot allocate memory."); - t->title = s; - INIT_LIST_HEAD(&t->items); - list_add(&t->l_menu, &menu.submenus); -@@ -101,11 +101,11 @@ - static unsigned short longest; - int len = strlen(i->name);// + strlen(i->descr) + 1; - if(!(t = find_submenu(title))) { --//dolog(__FUNCTION__ ": cannot find title %s\n", title); -+//dolog("%s: cannot find title %s\n", __func__, title); - return; - } - if(len > longest) longest = len; --//dolog(__FUNCTION__": %d %d %d\n", longest, strlen(i->descr), t->cols); -+//dolog("%s: %d %d %d\n", __func__, longest, strlen(i->descr), t->cols); - if(longest + strlen(i->descr) + 3 > t->cols) - t->cols = 3 + longest + strlen(i->descr); - if(!t->rows) t->rows = 3; /* make space for a border line */ -@@ -193,7 +193,7 @@ - { - set_size(); - menu.wd = newpad(1, menu.cols); -- if(!menu.wd) prg_exit(__FUNCTION__ ": Cannot allocate memory."); -+ if(!menu.wd) prg_exit("menu_create: Cannot allocate memory."); - wbkgd(menu.wd, COLOR_PAIR(9)); - // overwrite(info_win.wd, menu.wd); - werase(menu.wd); -@@ -276,7 +276,7 @@ - return 1; - } - if(!menu.wd) return 0; --dolog(__FUNCTION__"submenu_wd %p\n", submenu_wd); -+dolog("%s submenu_wd %p\n", __func__, submenu_wd); - switch(key) { - case KBD_ESC: - menu_destroy(); -@@ -291,7 +291,7 @@ - if(!submenu_show()) return 1; - if(change_item(cur_item->l_submenu.prev)) - highlight_item(cur_submenu, 1); -- dolog(__FUNCTION__": cur item %s\n", cur_item->name); -+ dolog("%s: cur item %s\n", __func__, cur_item->name); - break; - case KBD_UP: - if(!submenu_show()) return 1; -@@ -308,10 +308,10 @@ - menu_destroy(); - break; - default: --dolog(__FUNCTION__": [%d] skipped\n", key); -+dolog("%s: [%d] skipped\n", __func__, key); - return KEY_HANDLED; - } --dolog(__FUNCTION__":[%d] accepted\n", key); -+dolog("%s:[%d] accepted\n", __func__, key); - return KEY_HANDLED; - } - ---- whowatch-1.6.0.orig/src/menu_hooks.c -+++ whowatch-1.6.0/src/menu_hooks.c -@@ -9,7 +9,7 @@ - - void m_exit(void) - { --dolog(__FUNCTION__":entering\n"); -+dolog("%s:entering\n", __func__); - prg_exit(""); - } - void m_details(void) ---- whowatch-1.6.0.orig/src/process.c -+++ whowatch-1.6.0/src/process.c -@@ -275,7 +275,7 @@ - - if(!(key&KBD_CTRL)) return KEY_SKIPPED; - key &= KBD_MASK; --dolog(__FUNCTION__": %x %x\n", key, 'H'); -+dolog("%s: %x %x\n", __func__, key, 'H'); - - switch(key) { - case 'K': signal = 9; break; ---- whowatch-1.6.0.orig/src/screen.c -+++ whowatch-1.6.0/src/screen.c -@@ -41,7 +41,7 @@ - void win_init(void) - { - curs_buf = realloc(curs_buf, screen_cols * sizeof(chtype)); -- if(!curs_buf) errx(1, __FUNCTION__ ": Cannot allocate memory."); -+ if(!curs_buf) errx(1, "%s: Cannot allocate memory.", __func__); - bzero(curs_buf, sizeof(chtype) * screen_cols); - users_list.rows = screen_rows - RESERVED_LINES - 1; - users_list.cols = screen_cols - 2; ---- whowatch-1.6.0.orig/src/search.c -+++ whowatch-1.6.0/src/search.c -@@ -39,7 +39,7 @@ - /* move the cursor to appropriate line */ - to_line(p, current); - pad_draw(); --dolog(__FUNCTION__": %d\n", p); -+dolog("%s: %d\n", __func__, p); - } - - ---- whowatch-1.6.0.orig/src/subwin.c -+++ whowatch-1.6.0/src/subwin.c -@@ -67,7 +67,7 @@ - sub_current->offset--; - break; - case 'y': --dolog(__FUNCTION__": sending %d signal to %d\n" ,signals[sub_current->arrow].sig, cur_pid); -+dolog("%s: sending %d signal to %d\n", __func__, signals[sub_current->arrow].sig, cur_pid); - do_signal(signals[sub_current->arrow].sig, cur_pid); - return KEY_HANDLED; - default: return KEY_SKIPPED; -@@ -116,7 +116,7 @@ - int size = sizeof signals/sizeof (struct signal_t); - char buf[16]; - int i, pid = *(int *) p; --dolog(__FUNCTION__": pid %d\n", pid); -+dolog("%s: pid %d\n", __func__, pid); - if(pid <= 0) { - title("No valid pid selected"); - return; -@@ -155,11 +155,11 @@ - { - assert(sub_current); - main_pad->wd = newpad(SUBWIN_ROWS, SUBWIN_COLS); -- if(!main_pad->wd) prg_exit(__FUNCTION__ ": cannot create details window."); -+ if(!main_pad->wd) prg_exit("pad_create: cannot create details window."); - set_size(main_pad); - w->offset = w->lines = w->xoffset = 0; - border_wd = newpad(BORDER_ROWS+1, BORDER_COLS+1); -- if(!border_wd) prg_exit(__FUNCTION__ ": cannot create details window."); -+ if(!border_wd) prg_exit("pad_create: cannot create details window."); - wbkgd(border_wd, COLOR_PAIR(8)); - werase(border_wd); - box(border_wd, ACS_VLINE, ACS_HLINE); -@@ -218,7 +218,7 @@ - { - void *p; - assert(sub_current); --dolog(__FUNCTION__":entering\n"); -+dolog("%s:entering\n", __func__); - if(!main_pad->wd) return; - werase(main_pad->wd); - sub_current->lines = 0; -@@ -226,7 +226,7 @@ - if(sub_current == &sub_info) { - draw_plugin(0); - // pad_refresh(); --dolog(__FUNCTION__"; info only..skipping draw\n"); -+dolog("%s; info only..skipping draw\n", __func__); - return; - } - p = on_cursor(); -@@ -242,7 +242,7 @@ - draw_plugin(p); - } - else { --dolog(__FUNCTION__"; only builtin draw\n"); -+dolog("%s; only builtin draw\n", __func__); - sub_current->builtin_draw(p); - } - /* number of data lines probably has changed - adjust offset */ -@@ -316,7 +316,7 @@ - snprintf(dlerr, sizeof dlerr, "%s", dlerror()); - return dlerr; - } --dolog(__FUNCTION__" dlopen returned %x\n", h); -+dolog("%s dlopen returned %x\n", __func__, h); - /* - * Check if the same plugin has been loaded. - * Plugin's name could be the same but code could be different. -@@ -325,10 +325,10 @@ - */ - for(i = 0; i < sizeof sb/sizeof(struct subwin *); i++) { - if(sb[i]->handle == h) { --dolog(__FUNCTION__": subwin %d has handle %x\n", i, sb[i]->handle); -+dolog("%s: subwin %d has handle %x\n", __func__, i, sb[i]->handle); - dlclose(h); - dlclose(sb[i]->handle); --dolog(__FUNCTION__": plugin already loaded in subwin %d, count %d\n", i, i); -+dolog("%s: plugin already loaded in subwin %d, count %d\n", __func__, i, i); - sb[i]->handle = h = 0; - goto AGAIN; - break; -@@ -352,14 +352,14 @@ - if(target->handle) { - int i; - i = dlclose(target->handle); --dolog(__FUNCTION__": closing prev library: %d %s\n", i, dlerror()); -+dolog("%s: closing prev library: %d %s\n", __func__, i, dlerror()); - } --dolog(__FUNCTION__": plugin loaded\n"); -+dolog("%s: plugin loaded\n", __func__); - target->handle = h; - target->flags = target->plugin_init(on_cursor()); - return 0; - ERROR: --dolog(__FUNCTION__": plugin not loaded\n"); -+dolog("%s: plugin not loaded\n", __func__); - snprintf(dlerr, sizeof dlerr, "%s", err); - dlclose(h); - return dlerr; -@@ -398,7 +398,7 @@ - sub_main.plugin_clear = dummy; - sub_main.plugin_cleanup = dummy; - main_pad = calloc(1, sizeof(struct pad_t)); -- if(!main_pad) prg_exit(__FUNCTION__": cannot allocate memory."); -+ if(!main_pad) prg_exit("subwin_init: cannot allocate memory."); - sub_main.arrow = -1; - memcpy(&sub_proc, &sub_main, sizeof(sub_main)); - memcpy(&sub_user, &sub_main, sizeof(sub_main)); -@@ -412,7 +412,7 @@ - sub_current = &sub_user; - /* set builtin plugins */ - builtin_set(); --dolog(__FUNCTION__": %d %d\n", sub_main.arrow, sub_proc.arrow); -+dolog("%s: %d %d\n", __func__, sub_main.arrow, sub_proc.arrow); - - } - -@@ -442,11 +442,11 @@ - } - default: return KEY_SKIPPED; - } --dolog(__FUNCTION__": key processed\n"); --dolog(__FUNCTION__": cur %d, %d %d\n", sub_current->arrow, sub_main.arrow, sub_proc.arrow); -+dolog("%s: key processed\n", __func__); -+dolog("%s: cur %d, %d %d\n", __func__, sub_current->arrow, sub_main.arrow, sub_proc.arrow); - - sub_change(sub_current); --dolog(__FUNCTION__": cur %d, %d %d\n", sub_current->arrow, sub_main.arrow, sub_proc.arrow); -+dolog("%s: cur %d, %d %d\n", __func__, sub_current->arrow, sub_main.arrow, sub_proc.arrow); - - return KEY_HANDLED; - } -@@ -455,10 +455,10 @@ - { - if(!main_pad->wd) return; - if(sub_current->flags & PERIODIC) { --dolog(__FUNCTION__": doing plugin (and perhaps builtin) draw\n"); -+dolog("%s: doing plugin (and perhaps builtin) draw\n", __func__); - pad_draw(); - } --dolog(__FUNCTION__": doing refresh\n"); -+dolog("%s: doing refresh\n", __func__); - pad_refresh(); - } - ---- whowatch-1.6.0.orig/src/user.c -+++ whowatch-1.6.0/src/user.c -@@ -57,7 +57,7 @@ - int i; - struct prot_t *t; - users_list.d_lines += p; --dolog(__FUNCTION__": dlines %d\n", users_list.d_lines); -+dolog("%s: dlines %d\n", __func__, users_list.d_lines); - for(i = 0; i < sizeof prot_tab/sizeof(struct prot_t); i++){ - t = &prot_tab[i]; - if(strncmp(t->s, name, strlen(t->s))) continue; -@@ -217,7 +217,7 @@ - while((i = read(wtmp_fd, &entry, sizeof entry)) > 0){ - if (i < sizeof entry){ - curses_end(); -- errx(1, __FUNCTION__ ": error reading " WTMP_FILE ); -+ errx(1, "%s: error reading " WTMP_FILE, __func__ ); - } - /* user just logged in */ - #ifdef HAVE_USER_PROCESS -@@ -328,10 +328,10 @@ - void users_init(void) - { - if((wtmp_fd = open(WTMP_FILE ,O_RDONLY)) == -1) -- errx(1, __FUNCTION__ ": cannot open " WTMP_FILE ": %s", -+ errx(1, "%s: cannot open " WTMP_FILE ": %s", __func__, - strerror(errno)); - if(lseek(wtmp_fd, 0, SEEK_END) == -1) -- errx(1, __FUNCTION__ ": cannot seek in " WTMP_FILE ": %s", -+ errx(1, "%s: cannot seek in " WTMP_FILE ": %s", __func__, - strerror(errno)); - users_list.giveme_line = users_list_giveline; - users_list.keys = ulist_key; ---- whowatch-1.6.0.orig/src/whowatch.c -+++ whowatch-1.6.0/src/whowatch.c -@@ -152,7 +152,7 @@ - default: return; - } - SKIP: --dolog(__FUNCTION__": doing refresh\n"); -+dolog("%s: doing refresh\n", __func__); - wnoutrefresh(main_win); - wnoutrefresh(info_win.wd); - pad_refresh(); -@@ -170,7 +170,7 @@ - *x = win.ws_col; - return; - } -- prg_exit(__FUNCTION__ ": ioctl error: cannot read screen size."); -+ prg_exit(": ioctl error: cannot read screen size."); - } - - static void winch_handler() - diff --git a/whowatch-gcc4.patch b/whowatch-gcc4.patch deleted file mode 100644 index 1dfb59c..0000000 --- a/whowatch-gcc4.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN ../tmp-orig/whowatch-1.6.0/src/process.c ./src/process.c ---- ../tmp-orig/whowatch-1.6.0/src/process.c 2005-03-03 15:58:43.561876676 +0100 -+++ ./src/process.c 2005-03-03 15:58:23.855680335 +0100 -@@ -75,7 +75,7 @@ - memset(z, 0, sizeof *z); - check_line(l); - z->line = l++; -- (struct process *) p->priv = z; -+ p->priv = z; - z->proc = p; - if (*current){ - z->next = *current; -diff -urN ../tmp-orig/whowatch-1.6.0/src/subwin.c ./src/subwin.c ---- ../tmp-orig/whowatch-1.6.0/src/subwin.c 2005-03-03 15:58:43.562876483 +0100 -+++ ./src/subwin.c 2005-03-03 15:58:37.076128545 +0100 -@@ -201,7 +201,7 @@ - static void *p = 0; - static int pid; - if(current == &users_list) -- (char *)p = cursor_user()->name; -+ p = cursor_user()->name; - else { - pid = cursor_pid(); - p = &pid; - ---- whowatch-1.6.0/src/menu.c 2005-04-05 08:37:26.334311640 -0400 -+++ whowatch-1.6.0.new/src/menu.c 2005-04-05 08:28:17.000000000 -0400 -@@ -37,7 +37,7 @@ - static unsigned short item_cursor; - - #define DUMMY_HEAD {0, 0} --static char *submenus[] = { "File", "View", "Process", "Users", "Help" }; -+static char *submenus[] = { "File", "View", "Process", "Users", "Help", NULL }; - struct item_bind_t { - unsigned short submenu; /* index in the submenus table */ - struct item_t item; diff --git a/whowatch.spec b/whowatch.spec deleted file mode 100644 index ae103b0..0000000 --- a/whowatch.spec +++ /dev/null @@ -1,70 +0,0 @@ -Name: whowatch -Version: 1.6.0 -Release: 1 -Summary: Displays informations about the users currently logged in - -Group: Applications/System -License: GPL -URL: http://wizard.ae.krakow.pl/~mike/ -Source0: http://wizard.ae.krakow.pl/~mike/download/%{name}-%{version}.tar.gz -Patch0: whowatch-debian-patches.patch -Patch1: whowatch-gcc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel - -%description -Whowatch is an interactive console utility that displays informations about -the users currently logged on to the machine, in real time. -Besides standard information (login, tty, host, user's process) you can -see type of login (ie. ssh, telnet). You can also see selected user's -processes tree or all system processes tree. -In the process tree mode there is ability to send INT or KILL signal to -selected process. - -%prep -cat< - 1.6.0-1 -- Updated to 1.6.0 to fix gcc4 errors -- Added many patches from debian -- Added a patch to fix some gcc4 errors and a segmentation fault - -* Thu Apr 7 2005 Michael Schwendt -- rebuilt - -* Mon Aug 25 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 -- Remove libncurses dependency, and libncurses-devel version dependency - -* Wed Aug 20 2003 Nils O. Selåsdal - 0:1.4-0.fdr.1 -- Initial release. - From 3d6a11f37c3bb7d2abdcd403ebd3a08d3aabaeb4 Mon Sep 17 00:00:00 2001 From: Subhodip Biswas Date: Fri, 28 Sep 2007 14:32:52 +0000 Subject: [PATCH 12/62] *** empty log message *** --- Makefile | 21 +++++++++++++++++ dead.package | 0 sources | 1 + whowatch-1.4.patch | 11 +++++++++ whowatch.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 Makefile delete mode 100644 dead.package create mode 100644 sources create mode 100644 whowatch-1.4.patch create mode 100644 whowatch.spec diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2fbccd7 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: whowatch +# $Id$ +NAME := whowatch +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package deleted file mode 100644 index e69de29..0000000 diff --git a/sources b/sources new file mode 100644 index 0000000..5caf0bd --- /dev/null +++ b/sources @@ -0,0 +1 @@ +0870155e8b75b99f9954e76fb20f9528 whowatch-1.4.tar.gz diff --git a/whowatch-1.4.patch b/whowatch-1.4.patch new file mode 100644 index 0000000..f7aff2f --- /dev/null +++ b/whowatch-1.4.patch @@ -0,0 +1,11 @@ +--- process.c 2000-06-06 15:46:12.000000000 +0530 ++++ ../process.c 2007-09-24 23:36:02.000000000 +0530 +@@ -74,7 +74,7 @@ + memset(z, 0, sizeof *z); + check_line(l); + z->line = l++; +- (struct process *) p->priv = z; ++ p->priv = z; + z->proc = p; + if (*current){ + z->next = *current; diff --git a/whowatch.spec b/whowatch.spec new file mode 100644 index 0000000..772848d --- /dev/null +++ b/whowatch.spec @@ -0,0 +1,56 @@ +Summary: Display information about users currently logged on +Name: whowatch +Version: 1.4 +Release: 4%{?dist} +License: GPLv2 +Group: Applications/System +URL: http://wizard.ae.krakow.pl/~mike/ + +Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz +Patch0: %{name}-%{version}.patch +BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: ncurses-devel + +%description +Whowatch is an interactive console utility that displays informations about +the users currently logged on to the machine, in real time. Besides standard +information (login, tty, host, user's process) you can see type of login +(ie. ssh, telnet). You can also see selected user's processes tree or all +system processes tree. In the process tree mode there is ability to send +INT or KILL signal to selected process. + +%prep + +%setup -q +%patch0 -p0 + +%build +%configure +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf %{buildroot} +%{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \ + %{buildroot}%{_bindir} +#%makeinstall + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING KEYS README TODO +%doc %{_mandir}/man1/whowatch.1* +%{_bindir}/whowatch + +%changelog +* Mon Sep 24 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-4 +- fixed broken patch +* Mon Sep 24 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-3 +- fixed issues regarding patch +* Mon Sep 24 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-2 +- fixed few issues +* Sat Sep 22 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-1 +-Initial packaging. + From 17ce536a15daf08e2c8dae8c98c5a06451ced184 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 03:35:48 +0000 Subject: [PATCH 13/62] - Autorebuild for GCC 4.3 --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 772848d..8a020f4 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.4-5 +- Autorebuild for GCC 4.3 + * Mon Sep 24 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-4 - fixed broken patch * Mon Sep 24 2007 Subhodip Biswas <440volt.tux@gmail.com> - 1.4-3 From d13c10f4fc18115af6b84e5d86fd091099170a6e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:35:23 +0000 Subject: [PATCH 14/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 8a020f4..d878829 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 1.4-5 - Autorebuild for GCC 4.3 From fb4e371fbf923df33a683325c5b7e8d3e932ae38 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:14:53 +0000 Subject: [PATCH 15/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index d878829..60a4a0e 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 35a8a59d07d65620f7ad5cd4ac10e9d17f952217 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:13 +0000 Subject: [PATCH 16/62] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2fbccd7..0e4bedd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := whowatch SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ba5d314f44c36d0dccbb3799decae837a05aef91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:18:09 +0000 Subject: [PATCH 17/62] dist-git conversion --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 0e4bedd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: whowatch -# $Id$ -NAME := whowatch -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 364399da48c8511f7f650e79d5fea0ac17d2b7f5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:32:02 -0600 Subject: [PATCH 18/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 60a4a0e..2db2a26 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 27 2009 Fedora Release Engineering - 1.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From bf133fc3a51a11f413dd1f05298f461204cfad8e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 5 Mar 2011 22:22:35 +0100 Subject: [PATCH 19/62] fix error in patch: "/usr/bin/patch: **** rejecting target file name with ".." component: ../process.c" --- whowatch-1.4.patch | 4 ++-- whowatch.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/whowatch-1.4.patch b/whowatch-1.4.patch index f7aff2f..81512a1 100644 --- a/whowatch-1.4.patch +++ b/whowatch-1.4.patch @@ -1,5 +1,5 @@ ---- process.c 2000-06-06 15:46:12.000000000 +0530 -+++ ../process.c 2007-09-24 23:36:02.000000000 +0530 +--- process.c.orig 2000-06-06 15:46:12.000000000 +0530 ++++ process.c 2007-09-24 23:36:02.000000000 +0530 @@ -74,7 +74,7 @@ memset(z, 0, sizeof *z); check_line(l); diff --git a/whowatch.spec b/whowatch.spec index 2db2a26..3ac1017 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,10 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Sat Mar 05 2011 Adrian Reber - 1.4-9 +- fix error in patch: + "/usr/bin/patch: **** rejecting target file name with ".." component: ../process.c" + * Mon Feb 07 2011 Fedora Release Engineering - 1.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 6499db58afa16cd6a666288cb9542de08108186a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:18:15 -0600 Subject: [PATCH 20/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 3ac1017..141f1cf 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Mar 05 2011 Adrian Reber - 1.4-9 - fix error in patch: "/usr/bin/patch: **** rejecting target file name with ".." component: ../process.c" From 64a92fe6edb9b5c408fdba4f620e7cd5be5a6f3a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 22:33:17 -0500 Subject: [PATCH 21/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 141f1cf..e70b720 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 9363210a15ccb47ee1461c54183fda07282502ab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:06:48 -0600 Subject: [PATCH 22/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index e70b720..c612584 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From cccde33bacbe7b18f488f8118c3c75212b0dd2eb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:53:04 -0500 Subject: [PATCH 23/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index c612584..23273ad 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.4 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ INT or KILL signal to selected process. %{_bindir}/whowatch %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From b4c174adf8108e737a4cb5ea2fad83850fcd6489 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sun, 23 Feb 2014 13:02:29 +0000 Subject: [PATCH 24/62] Add .gitignore to exclude source --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f6d011b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/whowatch-1.4.tar.gz From 0019572b30ca46b202a9d13031538368ed942810 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sun, 23 Feb 2014 16:12:17 +0000 Subject: [PATCH 25/62] Update to 1.8.5 (rhbz#1068965) --- .gitignore | 1 + sources | 2 +- whowatch-1.4.patch | 11 ----------- whowatch.spec | 24 ++++++++++++------------ 4 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 whowatch-1.4.patch diff --git a/.gitignore b/.gitignore index f6d011b..41f36af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /whowatch-1.4.tar.gz +/whowatch-1.8.5.tar.gz diff --git a/sources b/sources index 5caf0bd..44e957b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0870155e8b75b99f9954e76fb20f9528 whowatch-1.4.tar.gz +8304e8907c7d9e585beda9bec9a9c5fb whowatch-1.8.5.tar.gz diff --git a/whowatch-1.4.patch b/whowatch-1.4.patch deleted file mode 100644 index 81512a1..0000000 --- a/whowatch-1.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- process.c.orig 2000-06-06 15:46:12.000000000 +0530 -+++ process.c 2007-09-24 23:36:02.000000000 +0530 -@@ -74,7 +74,7 @@ - memset(z, 0, sizeof *z); - check_line(l); - z->line = l++; -- (struct process *) p->priv = z; -+ p->priv = z; - z->proc = p; - if (*current){ - z->next = *current; diff --git a/whowatch.spec b/whowatch.spec index 23273ad..c23c1f3 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,29 +1,27 @@ Summary: Display information about users currently logged on Name: whowatch -Version: 1.4 -Release: 13%{?dist} +Version: 1.8.5 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz -Patch0: %{name}-%{version}.patch BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: ncurses-devel %description -Whowatch is an interactive console utility that displays informations about -the users currently logged on to the machine, in real time. Besides standard -information (login, tty, host, user's process) you can see type of login -(ie. ssh, telnet). You can also see selected user's processes tree or all -system processes tree. In the process tree mode there is ability to send -INT or KILL signal to selected process. +Whowatch is an interactive who-like program that displays information about the +users currently logged on to the machine, in real time. Besides standard +information (login name, tty, host, user's process), the type of the connection +(ie. telnet or ssh) is shown. You can toggle display between users' command or +idle time. You can watch processes tree, navigate in it and send INT and KILL +signals. %prep %setup -q -%patch0 -p0 %build %configure @@ -33,18 +31,20 @@ INT or KILL signal to selected process. %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \ %{buildroot}%{_bindir} -#%makeinstall %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING KEYS README TODO +%doc AUTHORS ChangeLog COPYING PLUGINS.readme README TODO %doc %{_mandir}/man1/whowatch.1* %{_bindir}/whowatch %changelog +* Sun Feb 23 2014 Richard Fearn - 1.8.5-1 +- Update to 1.8.5 (rhbz#1068965) + * Sun Aug 04 2013 Fedora Release Engineering - 1.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From fbb05c40f1ffd9a00b8a6c11e9f9f9dbb65bffc4 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sun, 23 Feb 2014 16:32:45 +0000 Subject: [PATCH 26/62] Put %makeinstall back in, which looked like it was commented out, but wasn't --- whowatch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/whowatch.spec b/whowatch.spec index c23c1f3..099edb6 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -31,6 +31,7 @@ signals. %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \ %{buildroot}%{_bindir} +%makeinstall %clean %{__rm} -rf %{buildroot} From 6c9a32515ffb6802cc97fae0bbf90c45cdb2e7a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:30:17 -0500 Subject: [PATCH 27/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 099edb6..7bd1a6d 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -43,6 +43,9 @@ signals. %{_bindir}/whowatch %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Feb 23 2014 Richard Fearn - 1.8.5-1 - Update to 1.8.5 (rhbz#1068965) From c59f76700351ab6f62d73a7960810035a2b6bb81 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:34:14 +0000 Subject: [PATCH 28/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 7bd1a6d..fac14a4 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -43,6 +43,9 @@ signals. %{_bindir}/whowatch %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1677804c8d84d3cc41ba170e08ab85ac437c145f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:24:06 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index fac14a4..a778728 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -43,6 +43,9 @@ signals. %{_bindir}/whowatch %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.8.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From c17ad91967e3712e6880dbff7a2c1b5a946c0a29 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Thu, 28 Jan 2016 20:14:19 +0000 Subject: [PATCH 30/62] Remove unnecessary %defattr --- whowatch.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index a778728..c77f107 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -37,12 +37,14 @@ signals. %{__rm} -rf %{buildroot} %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING PLUGINS.readme README TODO %doc %{_mandir}/man1/whowatch.1* %{_bindir}/whowatch %changelog +* Thu Jan 28 2016 Richard Fearn - 1.8.5-5 +- Remove unnecessary %%defattr + * Fri Jun 19 2015 Fedora Release Engineering - 1.8.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e687773062ab670b3dace23bc05feb826f319255 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:01:06 +0000 Subject: [PATCH 31/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index c77f107..22ed45c 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ signals. %{_bindir}/whowatch %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.8.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 28 2016 Richard Fearn - 1.8.5-5 - Remove unnecessary %%defattr From 0838f0ed1944e40f6036e5aa93d9bc1da7a71ea2 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Thu, 3 Mar 2016 19:49:25 +0000 Subject: [PATCH 32/62] Fix incorrect FSF address in COPYING --- gpl-2.0.txt | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++ whowatch.spec | 11 +- 2 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 gpl-2.0.txt diff --git a/gpl-2.0.txt b/gpl-2.0.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/whowatch.spec b/whowatch.spec index 22ed45c..95f43d1 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,12 +1,14 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz +Source1: gpl-2.0.txt + BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: ncurses-devel @@ -23,6 +25,10 @@ signals. %setup -q +# Replace COPYING file with current version of GPLv2, to fix FSF address +# Change submitted upstream: https://github.com/mtsuszycki/whowatch/pull/2 +mv %{SOURCE1} COPYING + %build %configure %{__make} %{?_smp_mflags} @@ -42,6 +48,9 @@ signals. %{_bindir}/whowatch %changelog +* Thu Mar 03 2016 Richard Fearn 1.8.5-7 +- Fix incorrect FSF address in COPYING + * Fri Feb 05 2016 Fedora Release Engineering - 1.8.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From f83c7298096c91c9dc63c65f933c9b1ca8319c1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:21:58 +0000 Subject: [PATCH 33/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 95f43d1..185abf8 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -48,6 +48,9 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.8.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Mar 03 2016 Richard Fearn 1.8.5-7 - Fix incorrect FSF address in COPYING From af52db591553eb8249b07b0536035bab4cd1f5a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:35:46 +0000 Subject: [PATCH 34/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 185abf8..7fb653d 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -48,6 +48,9 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.8.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.8.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 98b63e17f90fb65e641e77296ba40c74353c5548 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:15:51 +0000 Subject: [PATCH 35/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 7fb653d..fc474d4 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ @@ -48,6 +48,9 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.8.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.8.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c3da70aa38349bbaa20a1f9d9c382f0e1ab46a96 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 16 Sep 2017 17:59:28 +0100 Subject: [PATCH 36/62] Remove unnecessary Group: tag, BuildRoot: tag, and %%clean section --- whowatch.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index fc474d4..85b96b6 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,16 +1,13 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 -Group: Applications/System URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz Source1: gpl-2.0.txt -BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - BuildRequires: ncurses-devel %description @@ -39,15 +36,15 @@ mv %{SOURCE1} COPYING %{buildroot}%{_bindir} %makeinstall -%clean -%{__rm} -rf %{buildroot} - %files %doc AUTHORS ChangeLog COPYING PLUGINS.readme README TODO %doc %{_mandir}/man1/whowatch.1* %{_bindir}/whowatch %changelog +* Sat Sep 16 2017 Richard Fearn 1.8.5-11 +- Remove unnecessary Group: tag, BuildRoot: tag, and %%clean section + * Thu Aug 03 2017 Fedora Release Engineering - 1.8.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 83d0980c031b085ebaf3c3b5f4126af72a3fea2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:55:09 +0000 Subject: [PATCH 37/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 85b96b6..904b3b9 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.8.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Sep 16 2017 Richard Fearn 1.8.5-11 - Remove unnecessary Group: tag, BuildRoot: tag, and %%clean section From 7782f4f47054c9a536915faa1a328c3e1a06291b Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 24 Feb 2018 18:33:45 +0000 Subject: [PATCH 38/62] Add BuildRequires: gcc See https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- whowatch.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 904b3b9..9cefb61 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,13 +1,14 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.5 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz Source1: gpl-2.0.txt +BuildRequires: gcc BuildRequires: ncurses-devel %description @@ -42,6 +43,10 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Sat Feb 24 2018 Richard Fearn - 1.8.5-13 +- Add BuildRequires: gcc + (see https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot) + * Fri Feb 09 2018 Fedora Release Engineering - 1.8.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6d57e270ee44e1613bb288e473120dccdca71108 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 14 Apr 2018 17:49:55 +0100 Subject: [PATCH 39/62] Update to 1.8.6 (bug #1567514) --- .gitignore | 1 + gpl-2.0.txt | 339 -------------------------------------------------- sources | 2 +- whowatch.spec | 14 +-- 4 files changed, 8 insertions(+), 348 deletions(-) delete mode 100644 gpl-2.0.txt diff --git a/.gitignore b/.gitignore index 41f36af..bdb0fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /whowatch-1.4.tar.gz /whowatch-1.8.5.tar.gz +/whowatch-1.8.6.tar.gz diff --git a/gpl-2.0.txt b/gpl-2.0.txt deleted file mode 100644 index d159169..0000000 --- a/gpl-2.0.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/sources b/sources index 44e957b..7d7a534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8304e8907c7d9e585beda9bec9a9c5fb whowatch-1.8.5.tar.gz +SHA512 (whowatch-1.8.6.tar.gz) = 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0 diff --git a/whowatch.spec b/whowatch.spec index 9cefb61..4616319 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,12 +1,11 @@ Summary: Display information about users currently logged on Name: whowatch -Version: 1.8.5 -Release: 13%{?dist} +Version: 1.8.6 +Release: 1%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ -Source0: http://wizard.ae.krakow.pl/~mike/download/whowatch-%{version}.tar.gz -Source1: gpl-2.0.txt +Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz BuildRequires: gcc BuildRequires: ncurses-devel @@ -23,10 +22,6 @@ signals. %setup -q -# Replace COPYING file with current version of GPLv2, to fix FSF address -# Change submitted upstream: https://github.com/mtsuszycki/whowatch/pull/2 -mv %{SOURCE1} COPYING - %build %configure %{__make} %{?_smp_mflags} @@ -43,6 +38,9 @@ mv %{SOURCE1} COPYING %{_bindir}/whowatch %changelog +* Sat Apr 14 2018 Richard Fearn - 1.8.6-1 +- Update to 1.8.6 (bug #1567514) + * Sat Feb 24 2018 Richard Fearn - 1.8.5-13 - Add BuildRequires: gcc (see https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot) From e55bc62da3fef3e5c4b16cb09ba3a281ff0e5146 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:49:45 +0000 Subject: [PATCH 40/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 4616319..c33c7f4 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -38,6 +38,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Apr 14 2018 Richard Fearn - 1.8.6-1 - Update to 1.8.6 (bug #1567514) From 9dc01970e3b560ebe7f259586123d7aea10a94e0 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 5 Jan 2019 10:12:31 +0000 Subject: [PATCH 41/62] Don't remove buildroot in %install section --- whowatch.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index c33c7f4..d2ce5db 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -27,7 +27,6 @@ signals. %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_mandir}/man1/ \ %{buildroot}%{_bindir} %makeinstall @@ -38,6 +37,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Jan 05 2019 Richard Fearn - 1.8.6-3 +- Don't remove buildroot in %%install section + * Sat Jul 14 2018 Fedora Release Engineering - 1.8.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5c0b53f0102f5b0433b424c775845af8c129f6f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:41:43 +0000 Subject: [PATCH 42/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index d2ce5db..840d76d 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -37,6 +37,9 @@ signals. %{_bindir}/whowatch %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.8.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jan 05 2019 Richard Fearn - 1.8.6-3 - Don't remove buildroot in %%install section From 5f05b98a21bc004999c59a26da0178f445755269 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:26:54 +0000 Subject: [PATCH 43/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 840d76d..555346b 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -37,6 +37,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.8.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.8.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From bc45c8b5ada237b6b105b9e565da7d96ad076619 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:40:53 +0000 Subject: [PATCH 44/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 555346b..653a653 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -37,6 +37,9 @@ signals. %{_bindir}/whowatch %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.8.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1ac5ffe46eeefb40b1551b43117bc0a763e42fa6 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sun, 2 Feb 2020 10:37:34 +0000 Subject: [PATCH 45/62] Use %license --- whowatch.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index 653a653..b8087ff 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -32,11 +32,15 @@ signals. %makeinstall %files -%doc AUTHORS ChangeLog COPYING PLUGINS.readme README TODO +%doc AUTHORS ChangeLog PLUGINS.readme README TODO %doc %{_mandir}/man1/whowatch.1* +%license COPYING %{_bindir}/whowatch %changelog +* Sun Feb 02 2020 Richard Fearn - 1.8.6-7 +- Use %%license + * Fri Jan 31 2020 Fedora Release Engineering - 1.8.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 57532078fe98956e66965e5025997732599d4da2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:07:28 +0000 Subject: [PATCH 46/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index b8087ff..0c88ade 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -38,6 +38,9 @@ signals. %{_bindir}/whowatch %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Feb 02 2020 Richard Fearn - 1.8.6-7 - Use %%license From bca4d0c35689d72bbe74ff553c6324c64904f13c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:54:34 +0000 Subject: [PATCH 47/62] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- whowatch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/whowatch.spec b/whowatch.spec index 0c88ade..f2f19d7 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -7,6 +7,7 @@ URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc BuildRequires: ncurses-devel From 20ab84c90e603c16b0bc4e6df710ad7716ed579e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:28:54 +0000 Subject: [PATCH 48/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index f2f19d7..bbc3e9a 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -39,6 +39,9 @@ signals. %{_bindir}/whowatch %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.8.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.8.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4c4ba115c4e9a8bbb6d0091537fdf8885ec49ff4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:55:51 +0000 Subject: [PATCH 49/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index bbc3e9a..30a6c3c 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -39,6 +39,9 @@ signals. %{_bindir}/whowatch %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.8.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f3dc18929cc8eb52d706fea06fc86ffb6ae41292 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:27:17 +0000 Subject: [PATCH 50/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 30a6c3c..2a805e8 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -39,6 +39,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.8.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.8.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From bf9767962d1fc9f9123113775168058748212b92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:24:16 +0000 Subject: [PATCH 51/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 2a805e8..a70f288 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ @@ -39,6 +39,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.8.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e0e8eb42f78d02c0ac880493cf1b025a3c31acd9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 26 Nov 2022 18:01:44 +0100 Subject: [PATCH 52/62] Port configure script to C99 Related to: --- whowatch-configure-c99.patch | 36 ++++++++++++++++++++++++++++++++++++ whowatch.spec | 12 +++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 whowatch-configure-c99.patch diff --git a/whowatch-configure-c99.patch b/whowatch-configure-c99.patch new file mode 100644 index 0000000..bf7e25a --- /dev/null +++ b/whowatch-configure-c99.patch @@ -0,0 +1,36 @@ +Avoid claling the undeclared exit function. Implicit function +declarations were removed from the C language in 1999, and future +compilers will refuse to compile calls to undeclared functions. + +Submitted upstream: + +diff --git a/configure b/configure +index 81d5eb056f2e59d0..4455e5a0211eeb61 100755 +--- a/configure ++++ b/configure +@@ -5354,8 +5354,8 @@ fd_set rfds; + struct timeval tv = {1, 0}; + FD_ZERO(&rfds); FD_SET(0,&rfds); + select(1,&rfds,0,0,&tv); +-if(tv.tv_sec == 0) exit(0); +-else exit(1); ++if(tv.tv_sec == 0) return 0; ++else return 1; + } + + _ACEOF +diff --git a/configure.ac b/configure.ac +index 64fad6e1023bd541..7be34fd802e608cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,8 +103,8 @@ fd_set rfds; + struct timeval tv = {1, 0}; + FD_ZERO(&rfds); FD_SET(0,&rfds); + select(1,&rfds,0,0,&tv); +-if(tv.tv_sec == 0) exit(0); +-else exit(1); ++if(tv.tv_sec == 0) return 0; ++else return 1; + } + ]])],[AC_MSG_RESULT(yes); AC_DEFINE([RETURN_TV_IN_SELECT],[1],[define if select() modifies the time value])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) + diff --git a/whowatch.spec b/whowatch.spec index a70f288..1e8517d 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,11 +1,12 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz +Patch0: whowatch-configure-c99.patch BuildRequires: make BuildRequires: gcc @@ -20,10 +21,12 @@ idle time. You can watch processes tree, navigate in it and send INT and KILL signals. %prep - -%setup -q +%autosetup -p1 %build +# Avoid regenerating configure script because whowatch-configure-c99.patch +# updates it directly. +touch aclocal.m4 Makefile.in src/config.h.in %configure %{__make} %{?_smp_mflags} @@ -39,6 +42,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Nov 26 2022 Florian Weimer - 1.8.6-13 +- Port configure script to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0f77025f84ed2f46e51ede3f32f9f6fdfc00c0e4 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Tue, 27 Dec 2022 18:28:51 +0000 Subject: [PATCH 53/62] Use SPDX license identifier --- whowatch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index 1e8517d..3496a9f 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,8 +1,8 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 13%{?dist} -License: GPLv2 +Release: 14%{?dist} +License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Tue Dec 27 2022 Richard Fearn - 1.8.6-14 +- Use SPDX license identifier + * Sat Nov 26 2022 Florian Weimer - 1.8.6-13 - Port configure script to C99 From 81a1d0dc39fc1789f2d16bbbc24f156f631ab075 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:48:22 +0000 Subject: [PATCH 54/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 3496a9f..b29c009 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 Richard Fearn - 1.8.6-14 - Use SPDX license identifier From 45717015700bec67804a2262cfa538294856c82f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:11:37 +0000 Subject: [PATCH 55/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index b29c009..1c87191 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 181b5b191e0840d870a8092d8833d18f1e9beff6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:45:16 +0000 Subject: [PATCH 56/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 1c87191..8cee597 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From aaa55d6e879fb8c573cb22e3fc58fd3e04541a4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:19:44 +0000 Subject: [PATCH 57/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 8cee597..40c3cc6 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 996010d0f3b430690e4da52b166433071a4cf16a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:00:16 +0000 Subject: [PATCH 58/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 40c3cc6..6eb6377 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fae3020e419c28f74dd542b1ef2b9e4836e825f6 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 25 Jan 2025 19:48:30 +0000 Subject: [PATCH 59/62] Fix FTBFS (bug #2341538) --- whowatch-gcc15-fixes.patch | 35 +++++++++++++++++++++++++++++++++++ whowatch.spec | 8 +++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 whowatch-gcc15-fixes.patch diff --git a/whowatch-gcc15-fixes.patch b/whowatch-gcc15-fixes.patch new file mode 100644 index 0000000..8ec2e76 --- /dev/null +++ b/whowatch-gcc15-fixes.patch @@ -0,0 +1,35 @@ +diff -ur a/src/proctree.h b/src/proctree.h +--- a/src/proctree.h 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/proctree.h 2025-01-25 18:55:39.018468480 +0000 +@@ -19,7 +19,6 @@ + }; + + int update_tree(void del(void*)); +-int update_tree(); + struct proc_t* find_by_pid(int pid); + struct proc_t* tree_start(int root, int start); + struct proc_t* tree_next(); +diff -ur a/src/whowatch.c b/src/whowatch.c +--- a/src/whowatch.c 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/whowatch.c 2025-01-25 19:05:36.133313903 +0000 +@@ -222,7 +222,7 @@ + size_changed = 0; + } + +-static void winch_handler() ++static void winch_handler(int i) + { + size_changed++; + } +diff -ur a/src/whowatch.h b/src/whowatch.h +--- a/src/whowatch.h 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/whowatch.h 2025-01-25 19:00:56.018861138 +0000 +@@ -164,7 +164,7 @@ + void curses_end(); + + /* proctree.c */ +-int update_tree(); ++int update_tree(void del(void*)); + + /* plist.c */ + void delete_tree_line(void *line); diff --git a/whowatch.spec b/whowatch.spec index 6eb6377..40ff351 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,13 +1,16 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz Patch0: whowatch-configure-c99.patch +# Submitted upstream: https://github.com/mtsuszycki/whowatch/pull/13 +Patch1: whowatch-gcc15-fixes.patch + BuildRequires: make BuildRequires: gcc BuildRequires: ncurses-devel @@ -42,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 25 2025 Richard Fearn - 1.8.6-20 +- Fix FTBFS (bug #2341538) + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.6-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7d5e84cbae5a29eef1a16405981005fc9dae016d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:24:46 +0000 Subject: [PATCH 60/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 40ff351..ffd7835 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 25 2025 Richard Fearn - 1.8.6-20 - Fix FTBFS (bug #2341538) From 2febda3d1d86c7fb01b5b92dcd895621ae606d22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:13:54 +0000 Subject: [PATCH 61/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index ffd7835..1dbdf13 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.8.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.8.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2e05e25f19e05359fac341621685d918c9fa5f85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:48:14 +0000 Subject: [PATCH 62/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 1dbdf13..66f7024 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.8.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.8.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild