Date: Mon, 25 Nov 2002 00:23:40 +0100 (CET) From: Jean-Yves Lefort <jylefort@brutele.be> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45693: New port: net/gkrellmmultiping2 Message-ID: <20021124232340.A973A22FE9@jsite.lefort.net>
next in thread | raw e-mail | index | archive | help
>Number: 45693
>Category: ports
>Synopsis: New port: net/gkrellmmultiping2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 24 15:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.7-RELEASE-p2 FreeBSD 4.7-RELEASE-p2 #0: Sat Nov 16 11:18:01 CET 2002 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# gkrellmmultiping2
# gkrellmmultiping2/files
# gkrellmmultiping2/files/patch-Makefile
# gkrellmmultiping2/files/patch-multiping.c
# gkrellmmultiping2/files/patch-pinger.c
# gkrellmmultiping2/pkg-comment
# gkrellmmultiping2/pkg-plist
# gkrellmmultiping2/distinfo
# gkrellmmultiping2/Makefile
# gkrellmmultiping2/pkg-descr
#
echo c - gkrellmmultiping2
mkdir -p gkrellmmultiping2 > /dev/null 2>&1
echo c - gkrellmmultiping2/files
mkdir -p gkrellmmultiping2/files > /dev/null 2>&1
echo x - gkrellmmultiping2/files/patch-Makefile
sed 's/^X//' >gkrellmmultiping2/files/patch-Makefile << 'END-of-gkrellmmultiping2/files/patch-Makefile'
X--- Makefile.orig Sun Nov 24 23:27:11 2002
X+++ Makefile Sun Nov 24 23:34:49 2002
X@@ -1,4 +1,4 @@
X-INSTALLDIR = /usr/local/lib/gkrellm2/plugins
X+INSTALLDIR = ${PREFIX}/libexec/gkrellm2/plugins
X VERSION = 2.0.1
X PKGNAME = gkrellm-multiping
X #OPT = -march=athlon -O2
X@@ -8,7 +8,7 @@
X all: pinger multiping.so
X
X pinger: pinger.c
X- $(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
X+ ${CC} `pkg-config glib-2.0 --cflags` ${OPT} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
X
X multiping.o: multiping.c decal_multiping_status.xpm
X $(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) -DVERSION=\"$(VERSION)\" -c multiping.c
X@@ -20,10 +20,10 @@
X rm -f *.o *.so core
X
X install: pinger multiping.so
X- install -d $(INSTALLDIR)
X- install -c -s -m 644 multiping.so $(INSTALLDIR)
X- install -c -s -m 4755 pinger $(INSTALLDIR)
X- echo "pinger helper is installed suid root"
X+ ${MKDIR} ${INSTALLDIR}
X+ ${INSTALL_DATA} multiping.so ${INSTALLDIR}
X+ ${INSTALL_PROGRAM} pinger ${INSTALLDIR}
X+ ${CHMOD} 4755 ${INSTALLDIR}/pinger
X
X dist:
X rm -rf $(PKGNAME)-$(VERSION)
END-of-gkrellmmultiping2/files/patch-Makefile
echo x - gkrellmmultiping2/files/patch-multiping.c
sed 's/^X//' >gkrellmmultiping2/files/patch-multiping.c << 'END-of-gkrellmmultiping2/files/patch-multiping.c'
X--- multiping.c.orig Sun Nov 24 23:55:46 2002
X+++ multiping.c Mon Nov 25 00:09:42 2002
X@@ -24,13 +24,14 @@
X #include <gkrellm2/gkrellm.h>
X #include <sys/types.h>
X #include <sys/wait.h>
X+#include <signal.h>
X
X #include "decal_multiping_status.xpm"
X
X #define CONFIG_NAME "Multiping"
X #define STYLE_NAME "multiping"
X
X-#define COMMAND "/usr/share/gkrellm/plugins/pinger"
X+#define COMMAND "@COMMAND@"
X
X static GkrellmMonitor *monitor;
X static GkrellmPanel *panel;
END-of-gkrellmmultiping2/files/patch-multiping.c
echo x - gkrellmmultiping2/files/patch-pinger.c
sed 's/^X//' >gkrellmmultiping2/files/patch-pinger.c << 'END-of-gkrellmmultiping2/files/patch-pinger.c'
X--- pinger.c.orig Sun Nov 24 23:35:59 2002
X+++ pinger.c Sun Nov 24 23:54:34 2002
X@@ -24,7 +24,9 @@
X #include <sys/file.h>
X #include <sys/time.h>
X #include <sys/signal.h>
X+#include <sys/types.h>
X
X+#include <netinet/in_systm.h>
X #include <netinet/in.h>
X #include <netinet/ip.h>
X #include <netinet/ip_icmp.h>
X@@ -33,6 +35,7 @@
X
X #include <stdio.h>
X #include <stdlib.h>
X+#include <unistd.h>
X #include <string.h>
X #include <fcntl.h>
X #include <ctype.h>
X@@ -102,17 +105,6 @@
X return h;
X }
X
X-static void host_free(host_data * h)
X-{
X- g_string_free(h->percentage, TRUE);
X- g_string_free(h->sent_str, TRUE);
X- g_string_free(h->recv_str, TRUE);
X- g_string_free(h->msg, TRUE);
X- g_string_free(h->shortmsg, TRUE);
X- pthread_mutex_destroy(&h->mutex);
X- g_free(h);
X-}
X-
X static gint compare_nhost(gconstpointer a, gconstpointer b)
X {
X return ((host_data *) a)->nhost - *(int *) b;
X@@ -218,54 +210,54 @@
X g_string_assign(s, "Echo Reply");
X /* XXX ID + Seq + Data */
X break;
X- case ICMP_DEST_UNREACH:
X+ case ICMP_UNREACH:
X switch (icp->icmp_code) {
X- case ICMP_NET_UNREACH:
X+ case ICMP_UNREACH_NET:
X g_string_assign(s, "Destination Net Unreachable");
X break;
X- case ICMP_HOST_UNREACH:
X+ case ICMP_UNREACH_HOST:
X g_string_assign(s, "Destination Host Unreachable");
X break;
X- case ICMP_PROT_UNREACH:
X+ case ICMP_UNREACH_PROTOCOL:
X g_string_assign(s, "Destination Protocol Unreachable");
X break;
X- case ICMP_PORT_UNREACH:
X+ case ICMP_UNREACH_PORT:
X g_string_assign(s, "Destination Port Unreachable");
X break;
X- case ICMP_FRAG_NEEDED:
X+ case ICMP_UNREACH_NEEDFRAG:
X g_string_assign(s, "Frag needed and DF set");
X break;
X- case ICMP_SR_FAILED:
X+ case ICMP_UNREACH_SRCFAIL:
X g_string_assign(s, "Source Route Failed");
X break;
X- case ICMP_NET_UNKNOWN:
X+ case ICMP_UNREACH_NET_UNKNOWN:
X g_string_assign(s, "Network Unknown");
X break;
X- case ICMP_HOST_UNKNOWN:
X+ case ICMP_UNREACH_HOST_UNKNOWN:
X g_string_assign(s, "Host Unknown");
X break;
X- case ICMP_HOST_ISOLATED:
X+ case ICMP_UNREACH_ISOLATED:
X g_string_assign(s, "Host Isolated");
X break;
X- case ICMP_NET_UNR_TOS:
X+ case ICMP_UNREACH_TOSNET:
X g_string_assign(s,
X "Destination Network Unreachable At This TOS");
X break;
X- case ICMP_HOST_UNR_TOS:
X+ case ICMP_UNREACH_TOSHOST:
X g_string_assign(s, "Destination Host Unreachable At This TOS");
X break;
X-#ifdef ICMP_PKT_FILTERED
X- case ICMP_PKT_FILTERED:
X+#ifdef ICMP_UNREACH_FILTER_PROHIB
X+ case ICMP_UNREACH_FILTER_PROHIB:
X g_string_assign(s, "Packet Filtered");
X break;
X #endif
X-#ifdef ICMP_PREC_VIOLATION
X- case ICMP_PREC_VIOLATION:
X+#ifdef ICMP_HOST_PRECEDENCE
X+ case ICMP_HOST_PRECEDENCE:
X g_string_assign(s, "Precedence Violation");
X break;
X #endif
X-#ifdef ICMP_PREC_CUTOFF
X- case ICMP_PREC_CUTOFF:
X+#ifdef ICMP_PRECEDENCE_CUTOFF
X+ case ICMP_PRECEDENCE_CUTOFF:
X g_string_assign(s, "Precedence Cutoff");
X break;
X #endif
X@@ -275,21 +267,21 @@
X break;
X }
X break;
X- case ICMP_SOURCE_QUENCH:
X+ case ICMP_SOURCEQUENCH:
X g_string_assign(s, "Source Quench");
X break;
X case ICMP_REDIRECT:
X switch (icp->icmp_code) {
X- case ICMP_REDIR_NET:
X+ case ICMP_REDIRECT_NET:
X g_string_assign(s, "Redirect Network");
X break;
X- case ICMP_REDIR_HOST:
X+ case ICMP_REDIRECT_HOST:
X g_string_assign(s, "Redirect Host");
X break;
X- case ICMP_REDIR_NETTOS:
X+ case ICMP_REDIRECT_TOSNET:
X g_string_assign(s, "Redirect Type of Service and Network");
X break;
X- case ICMP_REDIR_HOSTTOS:
X+ case ICMP_REDIRECT_TOSHOST:
X g_string_assign(s, "Redirect Type of Service and Host");
X break;
X default:
X@@ -303,12 +295,12 @@
X g_string_assign(s, "Echo Request");
X /* XXX ID + Seq + Data */
X break;
X- case ICMP_TIME_EXCEEDED:
X+ case ICMP_TIMXCEED:
X switch (icp->icmp_code) {
X- case ICMP_EXC_TTL:
X+ case ICMP_TIMXCEED_INTRANS:
X g_string_assign(s, "Time to live exceeded");
X break;
X- case ICMP_EXC_FRAGTIME:
X+ case ICMP_TIMXCEED_REASS:
X g_string_assign(s, "Frag reassembly time exceeded");
X break;
X default:
X@@ -317,23 +309,23 @@
X break;
X }
X break;
X- case ICMP_PARAMETERPROB:
X+ case ICMP_PARAMPROB:
X g_string_sprintf(s, "Parameter problem: IP address = %s",
X inet_ntoa(icp->icmp_gwaddr));
X break;
X- case ICMP_TIMESTAMP:
X+ case ICMP_TSTAMP:
X g_string_assign(s, "Timestamp");
X /* XXX ID + Seq + 3 timestamps */
X break;
X- case ICMP_TIMESTAMPREPLY:
X+ case ICMP_TSTAMPREPLY:
X g_string_assign(s, "Timestamp Reply");
X /* XXX ID + Seq + 3 timestamps */
X break;
X- case ICMP_INFO_REQUEST:
X+ case ICMP_IREQ:
X g_string_assign(s, "Information Request");
X /* XXX ID + Seq */
X break;
X- case ICMP_INFO_REPLY:
X+ case ICMP_IREQREPLY:
X g_string_assign(s, "Information Reply");
X /* XXX ID + Seq */
X break;
X@@ -428,11 +420,11 @@
X switch (icp->icmp_type) {
X case ICMP_ECHO:
X return;
X- case ICMP_SOURCE_QUENCH:
X+ case ICMP_SOURCEQUENCH:
X case ICMP_REDIRECT:
X- case ICMP_DEST_UNREACH:
X- case ICMP_TIME_EXCEEDED:
X- case ICMP_PARAMETERPROB:
X+ case ICMP_UNREACH:
X+ case ICMP_TIMXCEED:
X+ case ICMP_PARAMPROB:
X {
X struct ip *iph = (struct ip *) (&icp->icmp_data);
X struct icmp *icp1 =
X@@ -445,7 +437,7 @@
X icp1->icmp_id != ident)
X return;
X error_pkt = (icp->icmp_type != ICMP_REDIRECT &&
X- icp->icmp_type != ICMP_SOURCE_QUENCH);
X+ icp->icmp_type != ICMP_SOURCEQUENCH);
X
X h = (host_data *) g_list_find_custom(hosts,
X (int *) &icp1->
X@@ -636,8 +628,6 @@
X
X void append_host(struct in_addr ip)
X {
X- GString *s = g_string_new(NULL);
X-
X host_data *h = host_malloc();
X
X ((struct sockaddr_in *) &h->addr)->sin_addr = ip;
END-of-gkrellmmultiping2/files/patch-pinger.c
echo x - gkrellmmultiping2/pkg-comment
sed 's/^X//' >gkrellmmultiping2/pkg-comment << 'END-of-gkrellmmultiping2/pkg-comment'
XGKrellM multiping plugin
END-of-gkrellmmultiping2/pkg-comment
echo x - gkrellmmultiping2/pkg-plist
sed 's/^X//' >gkrellmmultiping2/pkg-plist << 'END-of-gkrellmmultiping2/pkg-plist'
Xlibexec/gkrellm2/plugins/multiping.so
Xlibexec/gkrellm2/plugins/pinger
END-of-gkrellmmultiping2/pkg-plist
echo x - gkrellmmultiping2/distinfo
sed 's/^X//' >gkrellmmultiping2/distinfo << 'END-of-gkrellmmultiping2/distinfo'
XMD5 (gkrellm-multiping-2.0.1.tgz) = 0f11252178bd0645dc2c77669c678be4
END-of-gkrellmmultiping2/distinfo
echo x - gkrellmmultiping2/Makefile
sed 's/^X//' >gkrellmmultiping2/Makefile << 'END-of-gkrellmmultiping2/Makefile'
X# New ports collection makefile for: gkrellmmultiping2
X# Date Created: 24 Nov 2002
X# Whom: Jean-Yves Lefort <jylefort@brutele.be>
X#
X# $FreeBSD$
X# $Id: Makefile,v 1.1.1.1 2002/11/24 23:19:28 jylefort Exp $
X#
X
XPORTNAME= gkrellmmultiping
XPORTVERSION= 2.0.1
XCATEGORIES= net
XMASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
XDISTNAME= gkrellm-multiping-${PORTVERSION}
XEXTRACT_SUFX= .tgz
X
XMAINTAINER= jylefort@brutele.be
X
XBUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
XRUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
X
XUSE_X_PREFIX= yes
XUSE_REINPLACE= yes
X
XMAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
X PTHREAD_LIBS="${PTHREAD_LIBS}" \
X MKDIR="${MKDIR}" \
X CHMOD="${CHMOD}" \
X INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
X INSTALL_DATA="${INSTALL_DATA}"
X
X.include <bsd.port.pre.mk>
X
Xpost-patch:
X ${REINPLACE_CMD} -e \
X "s,@COMMAND@,${PREFIX}/libexec/gkrellm2/plugins/pinger," \
X ${WRKSRC}/multiping.c
X
X.include <bsd.port.post.mk>
END-of-gkrellmmultiping2/Makefile
echo x - gkrellmmultiping2/pkg-descr
sed 's/^X//' >gkrellmmultiping2/pkg-descr << 'END-of-gkrellmmultiping2/pkg-descr'
XThis plugin pings several machines and shows the current
Xround-trip and status.
X
XWWW: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
X
X- Jean-Yves Lefort
Xjylefort@brutele.be
END-of-gkrellmmultiping2/pkg-descr
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021124232340.A973A22FE9>