From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 15 09:20:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D14DF106564A for ; Thu, 15 Jan 2009 09:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AC3D98FC13 for ; Thu, 15 Jan 2009 09:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F9K2O6021234 for ; Thu, 15 Jan 2009 09:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0F9K2YR021233; Thu, 15 Jan 2009 09:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jan 2009 09:20:02 GMT Resent-Message-Id: <200901150920.n0F9K2YR021233@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Björn König Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A1B11065674 for ; Thu, 15 Jan 2009 09:13:25 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203]) by mx1.freebsd.org (Postfix) with ESMTP id A0FE88FC0A for ; Thu, 15 Jan 2009 09:13:24 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from home.alpha-tierchen.de (port-87-234-81-139.dynamic.qsc.de [87.234.81.139]) by mail.liberty-hosting.de (Postfix) with ESMTP id 139BF3E8DF0 for ; Thu, 15 Jan 2009 09:35:14 +0100 (CET) Received: by home.alpha-tierchen.de (Postfix, from userid 2000) id 31D7C28A7E; Wed, 14 Jan 2009 14:20:51 +0100 (CET) Message-Id: <20090115084217.31D7C28A7E@home.alpha-tierchen.de> Date: Wed, 14 Jan 2009 14:20:51 +0100 (CET) From: Björn König To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/130577: [maintainer] update net/bcusdk-eibd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Björn König List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 09:20:03 -0000 >Number: 130577 >Category: ports >Synopsis: [maintainer] update net/bcusdk-eibd >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 15 09:20:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Björn König >Release: FreeBSD 7.1-RELEASE i386 >Organization: >Environment: >Description: The patch updates the port net/bcusdk-eibd to 0.0.4. All my patches went upstream. >How-To-Repeat: >Fix: --- ports-net-bcusdk-eibd.diff begins here --- diff --git ports/net/bcusdk-eibd/Makefile ports/net/bcusdk-eibd/Makefile index 9f1d257..7c8b79b 100644 --- ports/net/bcusdk-eibd/Makefile +++ ports/net/bcusdk-eibd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bcusdk -PORTVERSION= 0.0.3 +PORTVERSION= 0.0.4 CATEGORIES= net MASTER_SITES= http://www.auto.tuwien.ac.at/~mkoegler/eib/ PKGNAMESUFFIX= -eibd diff --git ports/net/bcusdk-eibd/distinfo ports/net/bcusdk-eibd/distinfo index 0171ecd..35f91c9 100644 --- ports/net/bcusdk-eibd/distinfo +++ ports/net/bcusdk-eibd/distinfo @@ -1,3 +1,3 @@ -MD5 (bcusdk_0.0.3.tar.gz) = 62f660e6b9b56f6926bffb99922ffaa5 -SHA256 (bcusdk_0.0.3.tar.gz) = f431d251478f4a69a9fc89cb5f2ef70e5929bbf7147fc8019cb083d559363035 -SIZE (bcusdk_0.0.3.tar.gz) = 547053 +MD5 (bcusdk_0.0.4.tar.gz) = 14138f457d6530bf45cf6a966fde9d5f +SHA256 (bcusdk_0.0.4.tar.gz) = 4d5cec9ae2d45e17ef2f566cb84f6895ae49255c86aacebc5af40839f1b5c0e9 +SIZE (bcusdk_0.0.4.tar.gz) = 574603 diff --git ports/net/bcusdk-eibd/files/patch-configure ports/net/bcusdk-eibd/files/patch-configure deleted file mode 100644 index b176264..0000000 --- ports/net/bcusdk-eibd/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2007-11-08 15:31:54.000000000 +0000 -+++ configure 2007-12-08 14:37:29.000000000 +0000 -@@ -5332,7 +5332,7 @@ - fi - - --have_source_info=no -+have_source_info=yes - have_linux_api=no - echo "$as_me:$LINENO: checking for linux/rtnetlink.h" >&5 - echo $ECHO_N "checking for linux/rtnetlink.h... $ECHO_C" >&6 diff --git ports/net/bcusdk-eibd/files/patch-eibd_client_c_eibclient-int.h ports/net/bcusdk-eibd/files/patch-eibd_client_c_eibclient-int.h deleted file mode 100644 index c353983..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_client_c_eibclient-int.h +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/client/c/eibclient-int.h.orig 2007-11-08 15:31:32.000000000 +0000 -+++ eibd/client/c/eibclient-int.h 2007-12-08 15:18:31.000000000 +0000 -@@ -30,7 +30,6 @@ - - #include - #include --#include - #include - - #include "eibclient.h" diff --git ports/net/bcusdk-eibd/files/patch-eibd_client_c_openremote.c ports/net/bcusdk-eibd/files/patch-eibd_client_c_openremote.c deleted file mode 100644 index 7946c39..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_client_c_openremote.c +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/client/c/openremote.c.orig 2007-11-08 15:31:32.000000000 +0000 -+++ eibd/client/c/openremote.c 2007-12-08 15:23:07.000000000 +0000 -@@ -25,6 +25,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include - #include - #include - #include diff --git ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetdescribe.cpp ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetdescribe.cpp deleted file mode 100644 index ca62e25..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetdescribe.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/eibnet/eibnetdescribe.cpp.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/eibnet/eibnetdescribe.cpp 2007-12-08 15:37:00.000000000 +0000 -@@ -19,7 +19,6 @@ - - #include - #include --#include - #include - #include - #include "eibnetip.h" diff --git ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetsearch.cpp ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetsearch.cpp deleted file mode 100644 index 2420a3d..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_eibnet_eibnetsearch.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/eibnet/eibnetsearch.cpp.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/eibnet/eibnetsearch.cpp 2007-12-08 15:37:52.000000000 +0000 -@@ -19,7 +19,6 @@ - - #include - #include --#include - #include - #include - #include "eibnetip.h" diff --git ports/net/bcusdk-eibd/files/patch-eibd_examples_common.c ports/net/bcusdk-eibd/files/patch-eibd_examples_common.c deleted file mode 100644 index f958f58..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_examples_common.c +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/examples/common.c.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/examples/common.c 2007-12-08 15:26:19.000000000 +0000 -@@ -17,7 +17,6 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - #include "common.h" --#include - #include - #include - diff --git ports/net/bcusdk-eibd/files/patch-eibd_examples_common.h ports/net/bcusdk-eibd/files/patch-eibd_examples_common.h deleted file mode 100644 index 1c34db8..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_examples_common.h +++ /dev/null @@ -1,10 +0,0 @@ ---- eibd/examples/common.h.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/examples/common.h 2007-12-08 15:00:10.000000000 +0000 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include "eibclient.h" - - /** unsigned char*/ diff --git ports/net/bcusdk-eibd/files/patch-eibd_libserver_apdu.cpp ports/net/bcusdk-eibd/files/patch-eibd_libserver_apdu.cpp deleted file mode 100644 index b3af3f0..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_libserver_apdu.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- eibd/libserver/apdu.cpp.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/libserver/apdu.cpp 2007-12-08 15:08:18.000000000 +0000 -@@ -18,8 +18,7 @@ - */ - - #include --#include - #include "apdu.h" - - APDU * - APDU::fromPacket (const CArray & c) diff --git ports/net/bcusdk-eibd/files/patch-eibd_libserver_eibnetip.cpp ports/net/bcusdk-eibd/files/patch-eibd_libserver_eibnetip.cpp deleted file mode 100644 index 4d9c3f2..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_libserver_eibnetip.cpp +++ /dev/null @@ -1,115 +0,0 @@ ---- eibd/libserver/eibnetip.cpp.orig Thu Nov 8 16:31:33 2007 -+++ eibd/libserver/eibnetip.cpp Tue Dec 18 14:36:10 2007 -@@ -17,11 +17,9 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include - #include - #include - #include --#include - #include "eibnetip.h" - #include "config.h" - #ifdef HAVE_LINUX_NETLINK -@@ -34,6 +32,11 @@ - #include - #undef Array - #endif -+#if defined(__FreeBSD__) -+#include -+#include -+#include -+#endif - - int - GetHostIP (struct sockaddr_in *sock, const char *Name) -@@ -45,6 +48,7 @@ - h = gethostbyname (Name); - if (!h) - return 0; -+ sock->sin_len = sizeof (*sock); - sock->sin_family = h->h_addrtype; - sock->sin_addr.s_addr = (*((unsigned long *) h->h_addr_list[0])); - return 1; -@@ -144,6 +148,54 @@ - } - #endif - -+#if defined(__FreeBSD__) -+typedef struct -+{ -+ struct rt_msghdr hdr; -+ char data[1000]; -+} r_req; -+ -+int -+GetSourceAddress (const struct sockaddr_in *dest, struct sockaddr_in *src) -+{ -+ int s; -+ r_req req; -+ char *cp = req.data; -+ memset(&req, 0, sizeof(req)); -+ memset(src, 0, sizeof (*src)); -+ s = socket(PF_ROUTE, SOCK_RAW, 0); -+ if (s == -1) -+ return 0; -+ req.hdr.rtm_msglen = sizeof(req) + sizeof(*dest); -+ req.hdr.rtm_version = RTM_VERSION; -+ req.hdr.rtm_flags = RTF_UP; -+ req.hdr.rtm_type = RTM_GET; -+ req.hdr.rtm_addrs = RTA_DST | RTA_IFP; -+ memcpy(cp, dest, sizeof(*dest)); -+ if (write (s, (char *)&req, req.hdr.rtm_msglen) < 0) -+ return 0; -+ if (read(s, (char *)&req, sizeof(req)) < 0) -+ return 0; -+ close(s); -+ int i; -+ cp = (char *)(&req.hdr + 1); -+ for (i = 1; i; i <<= 1) -+ if (i & req.hdr.rtm_addrs) -+ { -+ struct sockaddr *sa = (struct sockaddr *) cp; -+ if (i == RTA_IFA) -+ { -+ src->sin_len = sizeof (*src); -+ src->sin_family = AF_INET; -+ src->sin_addr.s_addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; -+ return 1; -+ } -+ cp += SA_SIZE(sa); -+ } -+ return 0; -+} -+#endif -+ - EIBNetIPPacket::EIBNetIPPacket () - { - service = 0; -@@ -208,6 +260,7 @@ - return 1; - ip = (buf[2] << 24) | (buf[3] << 16) | (buf[4] << 8) | (buf[5]); - port = (buf[6] << 8) | (buf[7]); -+ a->sin_len = sizeof (*a); - a->sin_family = AF_INET; - a->sin_port = htons (port); - a->sin_addr.s_addr = htonl (ip); -@@ -254,7 +307,7 @@ - if (fd != -1) - { - if (multicast) -- setsockopt (fd, SOL_IP, IP_DROP_MEMBERSHIP, &maddr, sizeof (maddr)); -+ setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &maddr, sizeof (maddr)); - close (fd); - } - } -@@ -265,7 +318,7 @@ - if (multicast) - throw Exception (DEV_OPEN_FAIL); - maddr = multicastaddr; -- if (setsockopt (fd, SOL_IP, IP_ADD_MEMBERSHIP, &maddr, sizeof (maddr)) == -+ if (setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &maddr, sizeof (maddr)) == - -1) - throw Exception (DEV_OPEN_FAIL); - multicast = 1; diff --git ports/net/bcusdk-eibd/files/patch-eibd_libserver_inetserver.cpp ports/net/bcusdk-eibd/files/patch-eibd_libserver_inetserver.cpp deleted file mode 100644 index ef57873..0000000 --- ports/net/bcusdk-eibd/files/patch-eibd_libserver_inetserver.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- eibd/libserver/inetserver.cpp.orig 2007-11-08 15:31:33.000000000 +0000 -+++ eibd/libserver/inetserver.cpp 2007-12-08 15:29:25.000000000 +0000 -@@ -17,11 +17,11 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include - #include - #include - #include - #include --#include - #include "inetserver.h" - - InetServer::InetServer (Layer3 * la3, Trace * tr, int port): diff --git ports/net/bcusdk-eibd/pkg-plist ports/net/bcusdk-eibd/pkg-plist index e339e4f..7acd36b 100644 --- ports/net/bcusdk-eibd/pkg-plist +++ ports/net/bcusdk-eibd/pkg-plist @@ -15,9 +15,12 @@ bin/eibnetsearch %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupresponse %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketlisten %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketread +%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketswrite +%%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsocketwrite %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupsresponse %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupswrite %%EXAMPLES%%%%EXAMPLESDIR%%/bin/groupwrite +%%EXAMPLES%%%%EXAMPLESDIR%%/bin/knxtool %%EXAMPLES%%%%EXAMPLESDIR%%/bin/madcread %%EXAMPLES%%%%EXAMPLESDIR%%/bin/maskver %%EXAMPLES%%%%EXAMPLESDIR%%/bin/mmaskver @@ -61,9 +64,12 @@ bin/eibnetsearch %%EXAMPLES%%%%EXAMPLESDIR%%/groupresponse.c %%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketlisten.c %%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketread.c +%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketswrite.c +%%EXAMPLES%%%%EXAMPLESDIR%%/groupsocketwrite.c %%EXAMPLES%%%%EXAMPLESDIR%%/groupsresponse.c %%EXAMPLES%%%%EXAMPLESDIR%%/groupswrite.c %%EXAMPLES%%%%EXAMPLESDIR%%/groupwrite.c +%%EXAMPLES%%%%EXAMPLESDIR%%/knxtool.c %%EXAMPLES%%%%EXAMPLESDIR%%/madcread.c %%EXAMPLES%%%%EXAMPLESDIR%%/maskver.c %%EXAMPLES%%%%EXAMPLESDIR%%/mmaskver.c @@ -93,6 +99,8 @@ bin/eibnetsearch %%EXAMPLES%%%%EXAMPLESDIR%%/writeaddress.c %%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin %%EXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%DATADIR%%/EIBConnection.cs +@dirrm %%DATADIR%% %%JAVA%%%%JAVASHAREDIR%%/eibclient.jar include/eibclient.h include/eibloadresult.h --- ports-net-bcusdk-eibd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: