diff options
author | 2005-07-04 11:59:12 +0000 | |
---|---|---|
committer | 2005-07-04 11:59:12 +0000 | |
commit | fe8bba428835ddac8834a4d19bb4ad2e93aa41ce (patch) | |
tree | e288b606cf4cff69ed622419c1df56f910c809f4 /net-analyzer/net-snmp/files | |
parent | Updated the postinst message for bug #97882. (diff) | |
download | gentoo-2-fe8bba428835ddac8834a4d19bb4ad2e93aa41ce.tar.gz gentoo-2-fe8bba428835ddac8834a4d19bb4ad2e93aa41ce.tar.bz2 gentoo-2-fe8bba428835ddac8834a4d19bb4ad2e93aa41ce.zip |
Version bump (5.1.3 final); tidy old ebuilds/patches/cruft. Also added BSD to LICENSE.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-analyzer/net-snmp/files')
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.1.1 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.1.3 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.2 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/digest-net-snmp-5.2.1 | 1 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-proc.patch | 72 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/snmpd.conf | 17 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/snmpd.rc6 | 30 |
9 files changed, 1 insertions, 124 deletions
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1 deleted file mode 100644 index b8c9c3775eda..000000000000 --- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 68f6c946387718e4f300cbb8b6c4bd43 net-snmp-5.1.1.tar.gz 2977122 diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3 new file mode 100644 index 000000000000..f9ac3a8a580b --- /dev/null +++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3 @@ -0,0 +1 @@ +MD5 66e54fe54709f98e45a466df069224cd net-snmp-5.1.3.tar.gz 3329840 diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1 deleted file mode 100644 index 58485c0e13eb..000000000000 --- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3_pre1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7a856cb6d0f15b7c0f9df2c112d79b1a net-snmp-5.1.3.pre1.tar.gz 3323892 diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2 deleted file mode 100644 index 947c6aadbcc3..000000000000 --- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 af1c18209474ec4851b06504aae2a7c1 net-snmp-5.2.tar.gz 3853153 diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3 deleted file mode 100644 index 947c6aadbcc3..000000000000 --- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 af1c18209474ec4851b06504aae2a7c1 net-snmp-5.2.tar.gz 3853153 diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1 deleted file mode 100644 index ea1106d64bfd..000000000000 --- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4c38451b1f5914789da370b79dc06124 net-snmp-5.2.1.tar.gz 3971320 diff --git a/net-analyzer/net-snmp/files/net-snmp-proc.patch b/net-analyzer/net-snmp/files/net-snmp-proc.patch deleted file mode 100644 index 9d68b7b12cda..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-proc.patch +++ /dev/null @@ -1,72 +0,0 @@ -=================================================================== -RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c,v -retrieving revision 5.4 -retrieving revision 5.6 -diff -u -r5.4 -r5.6 ---- net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c 2002/12/19 15:07:33 5.4 -+++ net-snmp/net-snmp/agent/mibgroup/ucd-snmp/proc.c 2003/02/07 05:17:42 5.6 -@@ -413,13 +413,15 @@ - sh_count_procs(char *procname) - { - DIR *dir; -- char cmdline[512]; -+ char cmdline[512], *tmpc; - struct dirent *ent; - int fd,len,plen=strlen(procname),total = 0; -+ FILE *status; - - if ((dir = opendir("/proc")) == NULL) return -1; - while (NULL != (ent = readdir(dir))) { - if(!(ent->d_name[0] >= '0' && ent->d_name[0] <= '9')) continue; -+#ifdef USE_PROC_CMDLINE /* old method */ - /* read /proc/XX/cmdline */ - sprintf(cmdline,"/proc/%s/cmdline",ent->d_name); - if((fd = open(cmdline, O_RDONLY)) < 0) break; -@@ -430,6 +432,30 @@ - while(--len && !cmdline[len]); - while(--len) if(!cmdline[len]) cmdline[len] = ' '; - if(!strncmp(cmdline,procname,plen)) total++; -+#else -+ /* read /proc/XX/status */ -+ sprintf(cmdline,"/proc/%s/status",ent->d_name); -+ if ((status = fopen(cmdline, "r")) == NULL) -+ break; -+ if (fgets(cmdline, sizeof(cmdline), status) == NULL) { -+ fclose(status); -+ break; -+ } -+ fclose(status); -+ cmdline[sizeof(cmdline)-1] = '\0'; -+ /* XXX: assumes Name: is first */ -+ if (strncmp("Name:",cmdline, 5) != 0) -+ break; -+ tmpc = skip_token(cmdline); -+ if (!tmpc) -+ break; -+ DEBUGMSGTL(("proc","Comparing wanted %s against %s\n", -+ procname, tmpc)); -+ if(!strncmp(tmpc,procname,plen)) { -+ total++; -+ DEBUGMSGTL(("proc", " Matched. total count now=%d\n", total)); -+ } -+#endif - } - closedir(dir); - return total; -@@ -662,8 +688,14 @@ - /* - * Zombie process - */ -- } else if (!strcmp(procname, info.pr_fname)) -- total++; -+ } else { -+ DEBUGMSGTL(("proc","Comparing wanted %s against %s\n", -+ procname, info.pr_fname)); -+ if (!strcmp(procname, info.pr_fname)) { -+ total++; -+ DEBUGMSGTL(("proc", " Matched. total count now=%d\n", total)); -+ } -+ } - - close(fd); - } diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf deleted file mode 100644 index 3fc3eec88827..000000000000 --- a/net-analyzer/net-snmp/files/snmpd.conf +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.6 2004/08/14 14:49:15 swegener Exp $ - -# Initial (empty) options. -SNMPD_FLAGS="" - -# Enable connection logging. -#SNMPD_FLAGS="${SNMPD_FLAGS} -a" - -# Enable syslog and disable file log. -#SNMPD_FLAGS="${SNMPD_FLAGS} -s -l /dev/null" - -# Enable agentx socket as /var/agentx/master -# *NOTE* Before uncommenting this, make sure -# the /var/agentx directory exists. -#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master" diff --git a/net-analyzer/net-snmp/files/snmpd.rc6 b/net-analyzer/net-snmp/files/snmpd.rc6 deleted file mode 100644 index da4e9d15a7d9..000000000000 --- a/net-analyzer/net-snmp/files/snmpd.rc6 +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.rc6,v 1.7 2004/07/14 23:06:06 agriffis Exp $ - -depend() { - use logger - need net -} - -checkconfig() { - if [ ! -e /etc/snmp/snmpd.conf ] ; then - eerror "You need an /etc/snmp/snmpd.conf config file to run snmpd" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting net-snmpd" - start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \ - -- -P /var/run/snmpd.pid ${SNMPD_FLAGS} - eend $? -} - -stop() { - ebegin "Stopping net-snmpd" - start-stop-daemon --stop --quiet --pidfile /var/run/snmpd.pid - eend $? -} |