pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openipmi: Rename OpenIPMI to openipmi



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Tue Nov 3 18:41:34 2020 +0000
Changeset:	ca224676124ea2086f4361ae81ec90beb981b163

Added Files:
	openipmi/DESCR
	openipmi/Makefile
	openipmi/PLIST
	openipmi/PLIST.Linux
	openipmi/TODO
	openipmi/buildlink3.mk
	openipmi/distinfo
	openipmi/options.mk
	openipmi/patches/patch-configure
	openipmi/patches/patch-lanserv_extcmd.c
	openipmi/patches/patch-unix_selector.c
Removed Files:
	OpenIPMI/DESCR
	OpenIPMI/Makefile
	OpenIPMI/PLIST
	OpenIPMI/PLIST.Linux
	OpenIPMI/TODO
	OpenIPMI/buildlink3.mk
	OpenIPMI/distinfo
	OpenIPMI/options.mk
	OpenIPMI/patches/patch-configure
	OpenIPMI/patches/patch-lanserv_extcmd.c
	OpenIPMI/patches/patch-unix_selector.c

Log Message:
openipmi: Rename OpenIPMI to openipmi

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ca224676124ea2086f4361ae81ec90beb981b163

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 OpenIPMI/DESCR                          |   2 -
 OpenIPMI/Makefile                       |  48 ---------------
 OpenIPMI/PLIST                          | 103 --------------------------------
 OpenIPMI/PLIST.Linux                    |   5 --
 OpenIPMI/TODO                           |   2 -
 OpenIPMI/buildlink3.mk                  |  14 -----
 OpenIPMI/distinfo                       |   9 ---
 OpenIPMI/options.mk                     |  40 -------------
 OpenIPMI/patches/patch-configure        |  15 -----
 OpenIPMI/patches/patch-lanserv_extcmd.c |  82 -------------------------
 OpenIPMI/patches/patch-unix_selector.c  |  18 ------
 openipmi/DESCR                          |   2 +
 openipmi/Makefile                       |  48 +++++++++++++++
 openipmi/PLIST                          | 103 ++++++++++++++++++++++++++++++++
 openipmi/PLIST.Linux                    |   5 ++
 openipmi/TODO                           |   2 +
 openipmi/buildlink3.mk                  |  14 +++++
 openipmi/distinfo                       |   9 +++
 openipmi/options.mk                     |  40 +++++++++++++
 openipmi/patches/patch-configure        |  15 +++++
 openipmi/patches/patch-lanserv_extcmd.c |  82 +++++++++++++++++++++++++
 openipmi/patches/patch-unix_selector.c  |  18 ++++++
 22 files changed, 338 insertions(+), 338 deletions(-)

diffs:
diff --git a/OpenIPMI/DESCR b/OpenIPMI/DESCR
deleted file mode 100644
index a2d01fef4d..0000000000
--- a/OpenIPMI/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The Open IPMI project aims to develop an open code base to allow access to
-platform information using Intelligent Platform Management Interface (IPMI).
diff --git a/OpenIPMI/Makefile b/OpenIPMI/Makefile
deleted file mode 100644
index 0d38cba78c..0000000000
--- a/OpenIPMI/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	OpenIPMI-2.0.29
-CATEGORIES=	sysutils
-MASTER_SITES=	https://newcontinuum.dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://openipmi.sourceforge.net/
-COMMENT=	User-level library that provides a higher-level abstraction of IPMI
-LICENSE=	gnu-lgpl-v2
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake perl pkg-config
-
-PKGCONFIG_OVERRIDE+=	OpenIPMI.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIcmdlang.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIglib.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIglib12.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIposix.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIpthread.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMItcl.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIui.pc.in
-PKGCONFIG_OVERRIDE+=	OpenIPMIutils.pc.in
-
-EGDIR=			${PREFIX}/share/examples/OpenIPMI
-EGFILES=		lan.conf ipmisim1.emu
-
-INSTALLATION_DIRS=	share/examples/OpenIPMI
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
-LDFLAGS+=		-lexecinfo
-BUILDLINK_TRANSFORM+=	rm:-ldl
-.endif
-
-post-install:
-.for file in ${EGFILES}
-	${MV} ${DESTDIR}${PREFIX}/etc/ipmi/${file} ${DESTDIR}${EGDIR}/${file}
-.endfor
-
-.include "options.mk"
-
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/OpenIPMI/PLIST b/OpenIPMI/PLIST
deleted file mode 100644
index 99625e34d9..0000000000
--- a/OpenIPMI/PLIST
+++ /dev/null
@@ -1,103 +0,0 @@
-@comment $NetBSD$
-bin/ipmi_sim
-bin/ipmi_ui
-bin/ipmicmd
-bin/ipmish
-bin/openipmicmd
-bin/openipmish
-bin/rmcp_ping
-bin/sdrcomp
-bin/solterm
-include/OpenIPMI/deprecator.h
-include/OpenIPMI/extcmd.h
-include/OpenIPMI/internal/ilist.h
-include/OpenIPMI/internal/ipmi_control.h
-include/OpenIPMI/internal/ipmi_domain.h
-include/OpenIPMI/internal/ipmi_entity.h
-include/OpenIPMI/internal/ipmi_event.h
-include/OpenIPMI/internal/ipmi_fru.h
-include/OpenIPMI/internal/ipmi_int.h
-include/OpenIPMI/internal/ipmi_locks.h
-include/OpenIPMI/internal/ipmi_malloc.h
-include/OpenIPMI/internal/ipmi_mc.h
-include/OpenIPMI/internal/ipmi_oem.h
-include/OpenIPMI/internal/ipmi_sel.h
-include/OpenIPMI/internal/ipmi_sensor.h
-include/OpenIPMI/internal/ipmi_utils.h
-include/OpenIPMI/internal/locked_list.h
-include/OpenIPMI/internal/md2.h
-include/OpenIPMI/internal/md5.h
-include/OpenIPMI/internal/opq.h
-include/OpenIPMI/ipmbserv.h
-include/OpenIPMI/ipmi_addr.h
-include/OpenIPMI/ipmi_auth.h
-include/OpenIPMI/ipmi_bits.h
-include/OpenIPMI/ipmi_cmdlang.h
-include/OpenIPMI/ipmi_conn.h
-include/OpenIPMI/ipmi_debug.h
-include/OpenIPMI/ipmi_err.h
-include/OpenIPMI/ipmi_fru.h
-include/OpenIPMI/ipmi_glib.h
-include/OpenIPMI/ipmi_lan.h
-include/OpenIPMI/ipmi_lanparm.h
-include/OpenIPMI/ipmi_log.h
-include/OpenIPMI/ipmi_mc.h
-include/OpenIPMI/ipmi_msgbits.h
-include/OpenIPMI/ipmi_pef.h
-include/OpenIPMI/ipmi_pet.h
-include/OpenIPMI/ipmi_picmg.h
-include/OpenIPMI/ipmi_posix.h
-include/OpenIPMI/ipmi_sdr.h
-include/OpenIPMI/ipmi_smi.h
-include/OpenIPMI/ipmi_sol.h
-include/OpenIPMI/ipmi_solparm.h
-include/OpenIPMI/ipmi_string.h
-include/OpenIPMI/ipmi_tcl.h
-include/OpenIPMI/ipmi_types.h
-include/OpenIPMI/ipmi_ui.h
-include/OpenIPMI/ipmi_user.h
-include/OpenIPMI/ipmiif.h
-include/OpenIPMI/lanserv.h
-include/OpenIPMI/mcserv.h
-include/OpenIPMI/msg.h
-include/OpenIPMI/mxp.h
-include/OpenIPMI/os_handler.h
-include/OpenIPMI/persist.h
-include/OpenIPMI/selector.h
-include/OpenIPMI/serserv.h
-include/OpenIPMI/serv.h
-lib/libIPMIlanserv.la
-lib/libOpenIPMI.la
-lib/libOpenIPMIcmdlang.la
-lib/libOpenIPMIposix.la
-lib/libOpenIPMIpthread.la
-lib/libOpenIPMIui.la
-lib/libOpenIPMIutils.la
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/OpenIPMI.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/OpenIPMI/OpenIPMI.so
-lib/pkgconfig/OpenIPMI.pc
-lib/pkgconfig/OpenIPMIcmdlang.pc
-lib/pkgconfig/OpenIPMIposix.pc
-lib/pkgconfig/OpenIPMIpthread.pc
-lib/pkgconfig/OpenIPMIui.pc
-lib/pkgconfig/OpenIPMIutils.pc
-${PLIST.python}${PYSITELIB}/OpenIPMI.py
-${PLIST.python}${PYSITELIB}/_OpenIPMI.la
-${PLIST.python}${PYSITELIB}/_OpenIPMI.a
-${PLIST.python}${PYSITELIB}/_OpenIPMI.so
-man/man1/ipmi_sim.1
-man/man1/ipmi_ui.1
-man/man1/openipmi_eventd.1
-man/man1/openipmicmd.1
-man/man1/openipmigui.1
-man/man1/openipmish.1
-man/man1/rmcp_ping.1
-man/man1/solterm.1
-man/man5/ipmi_lan.5
-man/man5/ipmi_sim_cmd.5
-man/man7/ipmi_cmdlang.7
-man/man7/openipmi_conparms.7
-share/examples/OpenIPMI/ipmisim1.emu
-share/examples/OpenIPMI/lan.conf
-@pkgdir man/man8
-@pkgdir etc/ipmi
diff --git a/OpenIPMI/PLIST.Linux b/OpenIPMI/PLIST.Linux
deleted file mode 100644
index 75f4c5dec3..0000000000
--- a/OpenIPMI/PLIST.Linux
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD$
-bin/ipmilan
-bin/openipmi_eventd
-man/man8/ipmilan.8
-@pkgdir man/man8
diff --git a/OpenIPMI/TODO b/OpenIPMI/TODO
deleted file mode 100644
index 254d510b3d..0000000000
--- a/OpenIPMI/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Test build on Linux
-
diff --git a/OpenIPMI/buildlink3.mk b/OpenIPMI/buildlink3.mk
deleted file mode 100644
index 259e9dd31c..0000000000
--- a/OpenIPMI/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	OpenIPMI
-
-.if !defined(OPENIPMI_BUILDLINK3_MK)
-OPENIPMI_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.OpenIPMI+=	OpenIPMI>=2.0.24
-BUILDLINK_PKGSRCDIR.OpenIPMI?=		../../sysutils/OpenIPMI
-
-.include "../../devel/popt/buildlink3.mk"
-.endif # OPENIPMI_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-OpenIPMI
diff --git a/OpenIPMI/distinfo b/OpenIPMI/distinfo
deleted file mode 100644
index 80bb52d6c5..0000000000
--- a/OpenIPMI/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (OpenIPMI-2.0.29.tar.gz) = a8dd1a9b877e94926af1da69421e8f2bd642c9c7
-RMD160 (OpenIPMI-2.0.29.tar.gz) = 1a82606dca2e585a5075eeb40e23aa10029724db
-SHA512 (OpenIPMI-2.0.29.tar.gz) = ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10
-Size (OpenIPMI-2.0.29.tar.gz) = 3119530 bytes
-SHA1 (patch-configure) = 644287934ea58b18aebad100cfe3f37c39eca3ff
-SHA1 (patch-lanserv_extcmd.c) = bb9d9b91343becc6a448efdf166b5095f5270eeb
-SHA1 (patch-unix_selector.c) = 45730697f0c4c110f4e34b4ff07a8dd9c4cc0a8b
diff --git a/OpenIPMI/options.mk b/OpenIPMI/options.mk
deleted file mode 100644
index cd3d9a3d5a..0000000000
--- a/OpenIPMI/options.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.OpenIPMI
-PKG_SUPPORTED_OPTIONS=		perl python snmp swig
-PKG_SUGGESTED_OPTIONS=		perl python snmp swig
-
-PLIST_VARS+=			perl python
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mperl)
-CONFIGURE_ARGS+=	--with-perl=${PERl5}
-.include "../../lang/perl5/buildlink3.mk"
-PLIST.perl=		yes
-.else
-CONFIGURE_ARGS+=	--with-perl=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
-.include "../../lang/python/pyversion.mk"
-PLIST.python=		yes
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
-.else
-CONFIGURE_ARGS+=	--with-python=no
-.endif
-
-.if !empty(PKG_OPTIONS:Msnmp)
-CONFIGURE_ARGS+=	--with-ucdsnmp=${PREFIX}
-.include "../../net/net-snmp/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--with-ucdsnmp=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mswig)
-CONFIGURE_ARGS+=	--with-swig=${PREFIX}/bin/swig3.0
-.include "../../devel/swig3/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--with-swig=no
-.endif
diff --git a/OpenIPMI/patches/patch-configure b/OpenIPMI/patches/patch-configure
deleted file mode 100644
index 86e1b07574..0000000000
--- a/OpenIPMI/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix bash-ism
-
---- configure.orig	2020-06-12 14:14:25.000000000 +0000
-+++ configure
-@@ -13061,7 +13061,7 @@ if test "x$ac_cv_header_tcl_tcl_h" = xye
- fi
- 
- 
--	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
-+	 if test "x$FOUND_TCL_HEADER" = "xyes"; then
- 	    tclcflags="-I /usr/include/tcl$ver"
-             TCL_CFLAGS="$tclcflags"
- 	 fi
diff --git a/OpenIPMI/patches/patch-lanserv_extcmd.c b/OpenIPMI/patches/patch-lanserv_extcmd.c
deleted file mode 100644
index 20d7f99dc1..0000000000
--- a/OpenIPMI/patches/patch-lanserv_extcmd.c
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD$
-
-Create compat functions.
-
---- lanserv/extcmd.c.orig	2017-07-27 22:01:19.000000000 +0000
-+++ lanserv/extcmd.c
-@@ -53,6 +53,7 @@
-  *      written permission.
-  */
- #include <config.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -61,8 +62,13 @@
- #elif defined(HAVE_SYS_ETHERNET_H)
- #include <sys/ethernet.h>
- #else
-+#if defined (__NetBSD__)
-+#include <net/if.h>
-+#include <net/if_ether.h>
-+#else
- #error "either netinet/ether.h or sys/ethernet.h must exist."
- #endif
-+#endif
- #include <ctype.h>
- #include <string.h>
- #include <errno.h>
-@@ -73,6 +79,53 @@
- #include <OpenIPMI/serv.h>
- #include <OpenIPMI/extcmd.h>
- 
-+/*
-+ * These two functions (ether_aton_r() and ether_ntoa_r()
-+ * were obtained from FreeBSD and modified for NetBSD
-+ */
-+
-+#ifndef ether_aton_r
-+/*
-+ * Convert an ASCII representation of an ethernet address to binary form.
-+ */
-+struct ether_addr *
-+ether_aton_r(const char *a, struct ether_addr *e)
-+{
-+        int i;
-+        unsigned int o0, o1, o2, o3, o4, o5;
-+
-+        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-+        if (i != 6)
-+                return (NULL);
-+        e->ether_addr_octet[0]=o0;
-+        e->ether_addr_octet[1]=o1;
-+        e->ether_addr_octet[2]=o2;
-+        e->ether_addr_octet[3]=o3;
-+        e->ether_addr_octet[4]=o4;
-+        e->ether_addr_octet[5]=o5;
-+        return (e);
-+}
-+#endif
-+
-+#ifndef ether_ntoa_r
-+/*
-+ * Convert a binary representation of an ethernet address to an ASCII string.
-+ */
-+char *
-+ether_ntoa_r(const struct ether_addr *n, char *a)
-+{
-+        int i;
-+
-+        i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->ether_addr_octet[0],
-+            n->ether_addr_octet[1], n->ether_addr_octet[2],
-+	    n->ether_addr_octet[3], n->ether_addr_octet[4],
-+	    n->ether_addr_octet[5]);
-+        if (i < 17)
-+                return (NULL);
-+        return (a);
-+}
-+#endif
-+
- static int
- extcmd_getval(void *baseloc, extcmd_info_t *t, char *val)
- {
diff --git a/OpenIPMI/patches/patch-unix_selector.c b/OpenIPMI/patches/patch-unix_selector.c
deleted file mode 100644
index bea2b41a41..0000000000
--- a/OpenIPMI/patches/patch-unix_selector.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Testy for EBADFD on respective platforms only.
-
---- unix/selector.c.orig	2020-10-08 11:19:47.295098497 +0000
-+++ unix/selector.c
-@@ -1030,7 +1030,11 @@ process_fds(struct selector_s	    *sel,
- 		  &tmp_except_set,
- 		  &ts, &sigmask);
-     if (err < 0) {
-+#if defined(EBADFD)
- 	if (errno == EBADF || errno == EBADFD)
-+#else
-+	if (errno == EBADF)
-+#endif
- 	    /* We raced, just retry it. */
- 	    goto retry;
- 	goto out;
diff --git a/openipmi/DESCR b/openipmi/DESCR
new file mode 100644
index 0000000000..a2d01fef4d
--- /dev/null
+++ b/openipmi/DESCR
@@ -0,0 +1,2 @@
+The Open IPMI project aims to develop an open code base to allow access to
+platform information using Intelligent Platform Management Interface (IPMI).
diff --git a/openipmi/Makefile b/openipmi/Makefile
new file mode 100644
index 0000000000..ab5b4f4493
--- /dev/null
+++ b/openipmi/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD$
+
+DISTNAME=	openipmi-2.0.29
+CATEGORIES=	sysutils
+MASTER_SITES=	https://newcontinuum.dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://openipmi.sourceforge.net/
+COMMENT=	User-level library that provides a higher-level abstraction of IPMI
+LICENSE=	gnu-lgpl-v2
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake perl pkg-config
+
+PKGCONFIG_OVERRIDE+=	OpenIPMI.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIcmdlang.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIglib.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIglib12.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIposix.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIpthread.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMItcl.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIui.pc.in
+PKGCONFIG_OVERRIDE+=	OpenIPMIutils.pc.in
+
+EGDIR=			${PREFIX}/share/examples/openipmi
+EGFILES=		lan.conf ipmisim1.emu
+
+INSTALLATION_DIRS=	share/examples/openipmi
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+LDFLAGS+=		-lexecinfo
+BUILDLINK_TRANSFORM+=	rm:-ldl
+.endif
+
+post-install:
+.for file in ${EGFILES}
+	${MV} ${DESTDIR}${PREFIX}/etc/ipmi/${file} ${DESTDIR}${EGDIR}/${file}
+.endfor
+
+.include "options.mk"
+
+.include "../../devel/popt/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openipmi/PLIST b/openipmi/PLIST
new file mode 100644
index 0000000000..99625e34d9
--- /dev/null
+++ b/openipmi/PLIST
@@ -0,0 +1,103 @@
+@comment $NetBSD$
+bin/ipmi_sim
+bin/ipmi_ui
+bin/ipmicmd
+bin/ipmish
+bin/openipmicmd
+bin/openipmish
+bin/rmcp_ping
+bin/sdrcomp
+bin/solterm
+include/OpenIPMI/deprecator.h
+include/OpenIPMI/extcmd.h
+include/OpenIPMI/internal/ilist.h
+include/OpenIPMI/internal/ipmi_control.h
+include/OpenIPMI/internal/ipmi_domain.h
+include/OpenIPMI/internal/ipmi_entity.h
+include/OpenIPMI/internal/ipmi_event.h
+include/OpenIPMI/internal/ipmi_fru.h
+include/OpenIPMI/internal/ipmi_int.h
+include/OpenIPMI/internal/ipmi_locks.h
+include/OpenIPMI/internal/ipmi_malloc.h
+include/OpenIPMI/internal/ipmi_mc.h
+include/OpenIPMI/internal/ipmi_oem.h
+include/OpenIPMI/internal/ipmi_sel.h
+include/OpenIPMI/internal/ipmi_sensor.h
+include/OpenIPMI/internal/ipmi_utils.h
+include/OpenIPMI/internal/locked_list.h
+include/OpenIPMI/internal/md2.h
+include/OpenIPMI/internal/md5.h
+include/OpenIPMI/internal/opq.h
+include/OpenIPMI/ipmbserv.h
+include/OpenIPMI/ipmi_addr.h
+include/OpenIPMI/ipmi_auth.h
+include/OpenIPMI/ipmi_bits.h
+include/OpenIPMI/ipmi_cmdlang.h
+include/OpenIPMI/ipmi_conn.h
+include/OpenIPMI/ipmi_debug.h
+include/OpenIPMI/ipmi_err.h
+include/OpenIPMI/ipmi_fru.h
+include/OpenIPMI/ipmi_glib.h
+include/OpenIPMI/ipmi_lan.h
+include/OpenIPMI/ipmi_lanparm.h
+include/OpenIPMI/ipmi_log.h
+include/OpenIPMI/ipmi_mc.h
+include/OpenIPMI/ipmi_msgbits.h
+include/OpenIPMI/ipmi_pef.h
+include/OpenIPMI/ipmi_pet.h
+include/OpenIPMI/ipmi_picmg.h
+include/OpenIPMI/ipmi_posix.h
+include/OpenIPMI/ipmi_sdr.h
+include/OpenIPMI/ipmi_smi.h
+include/OpenIPMI/ipmi_sol.h
+include/OpenIPMI/ipmi_solparm.h
+include/OpenIPMI/ipmi_string.h
+include/OpenIPMI/ipmi_tcl.h
+include/OpenIPMI/ipmi_types.h
+include/OpenIPMI/ipmi_ui.h
+include/OpenIPMI/ipmi_user.h
+include/OpenIPMI/ipmiif.h
+include/OpenIPMI/lanserv.h
+include/OpenIPMI/mcserv.h
+include/OpenIPMI/msg.h
+include/OpenIPMI/mxp.h
+include/OpenIPMI/os_handler.h
+include/OpenIPMI/persist.h
+include/OpenIPMI/selector.h
+include/OpenIPMI/serserv.h
+include/OpenIPMI/serv.h
+lib/libIPMIlanserv.la
+lib/libOpenIPMI.la
+lib/libOpenIPMIcmdlang.la
+lib/libOpenIPMIposix.la
+lib/libOpenIPMIpthread.la
+lib/libOpenIPMIui.la
+lib/libOpenIPMIutils.la
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/OpenIPMI.pm
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/OpenIPMI/OpenIPMI.so
+lib/pkgconfig/OpenIPMI.pc
+lib/pkgconfig/OpenIPMIcmdlang.pc
+lib/pkgconfig/OpenIPMIposix.pc
+lib/pkgconfig/OpenIPMIpthread.pc
+lib/pkgconfig/OpenIPMIui.pc
+lib/pkgconfig/OpenIPMIutils.pc
+${PLIST.python}${PYSITELIB}/OpenIPMI.py
+${PLIST.python}${PYSITELIB}/_OpenIPMI.la
+${PLIST.python}${PYSITELIB}/_OpenIPMI.a
+${PLIST.python}${PYSITELIB}/_OpenIPMI.so
+man/man1/ipmi_sim.1
+man/man1/ipmi_ui.1
+man/man1/openipmi_eventd.1
+man/man1/openipmicmd.1
+man/man1/openipmigui.1
+man/man1/openipmish.1
+man/man1/rmcp_ping.1
+man/man1/solterm.1
+man/man5/ipmi_lan.5
+man/man5/ipmi_sim_cmd.5
+man/man7/ipmi_cmdlang.7
+man/man7/openipmi_conparms.7
+share/examples/OpenIPMI/ipmisim1.emu
+share/examples/OpenIPMI/lan.conf
+@pkgdir man/man8
+@pkgdir etc/ipmi
diff --git a/openipmi/PLIST.Linux b/openipmi/PLIST.Linux
new file mode 100644
index 0000000000..75f4c5dec3
--- /dev/null
+++ b/openipmi/PLIST.Linux
@@ -0,0 +1,5 @@
+@comment $NetBSD$
+bin/ipmilan
+bin/openipmi_eventd
+man/man8/ipmilan.8
+@pkgdir man/man8
diff --git a/openipmi/TODO b/openipmi/TODO
new file mode 100644
index 0000000000..254d510b3d
--- /dev/null
+++ b/openipmi/TODO
@@ -0,0 +1,2 @@
+- Test build on Linux
+
diff --git a/openipmi/buildlink3.mk b/openipmi/buildlink3.mk
new file mode 100644
index 0000000000..d7f270aae5
--- /dev/null
+++ b/openipmi/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	openipmi
+
+.if !defined(OPENIPMI_BUILDLINK3_MK)
+OPENIPMI_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.openipmi+=	openipmi>=2.0.29
+BUILDLINK_PKGSRCDIR.openipmi?=		../../sysutils/openipmi
+
+.include "../../devel/popt/buildlink3.mk"
+.endif # OPENIPMI_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-openipmi
diff --git a/openipmi/distinfo b/openipmi/distinfo
new file mode 100644
index 0000000000..80bb52d6c5
--- /dev/null
+++ b/openipmi/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (OpenIPMI-2.0.29.tar.gz) = a8dd1a9b877e94926af1da69421e8f2bd642c9c7
+RMD160 (OpenIPMI-2.0.29.tar.gz) = 1a82606dca2e585a5075eeb40e23aa10029724db
+SHA512 (OpenIPMI-2.0.29.tar.gz) = ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10
+Size (OpenIPMI-2.0.29.tar.gz) = 3119530 bytes
+SHA1 (patch-configure) = 644287934ea58b18aebad100cfe3f37c39eca3ff
+SHA1 (patch-lanserv_extcmd.c) = bb9d9b91343becc6a448efdf166b5095f5270eeb
+SHA1 (patch-unix_selector.c) = 45730697f0c4c110f4e34b4ff07a8dd9c4cc0a8b
diff --git a/openipmi/options.mk b/openipmi/options.mk
new file mode 100644
index 0000000000..b3f11348b2
--- /dev/null
+++ b/openipmi/options.mk
@@ -0,0 +1,40 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.openipmi
+PKG_SUPPORTED_OPTIONS=		perl python snmp swig
+PKG_SUGGESTED_OPTIONS=		perl python snmp swig
+
+PLIST_VARS+=			perl python
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=	--with-perl=${PERl5}
+.include "../../lang/perl5/buildlink3.mk"
+PLIST.perl=		yes
+.else
+CONFIGURE_ARGS+=	--with-perl=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
+.include "../../lang/python/pyversion.mk"
+PLIST.python=		yes
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+.else
+CONFIGURE_ARGS+=	--with-python=no
+.endif
+
+.if !empty(PKG_OPTIONS:Msnmp)
+CONFIGURE_ARGS+=	--with-ucdsnmp=${PREFIX}
+.include "../../net/net-snmp/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-ucdsnmp=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mswig)
+CONFIGURE_ARGS+=	--with-swig=${PREFIX}/bin/swig3.0
+.include "../../devel/swig3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-swig=no
+.endif
diff --git a/openipmi/patches/patch-configure b/openipmi/patches/patch-configure
new file mode 100644
index 0000000000..86e1b07574
--- /dev/null
+++ b/openipmi/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix bash-ism
+
+--- configure.orig	2020-06-12 14:14:25.000000000 +0000
++++ configure
+@@ -13061,7 +13061,7 @@ if test "x$ac_cv_header_tcl_tcl_h" = xye
+ fi
+ 
+ 
+-	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
++	 if test "x$FOUND_TCL_HEADER" = "xyes"; then
+ 	    tclcflags="-I /usr/include/tcl$ver"
+             TCL_CFLAGS="$tclcflags"
+ 	 fi
diff --git a/openipmi/patches/patch-lanserv_extcmd.c b/openipmi/patches/patch-lanserv_extcmd.c
new file mode 100644
index 0000000000..20d7f99dc1
--- /dev/null
+++ b/openipmi/patches/patch-lanserv_extcmd.c
@@ -0,0 +1,82 @@
+$NetBSD$
+
+Create compat functions.
+
+--- lanserv/extcmd.c.orig	2017-07-27 22:01:19.000000000 +0000
++++ lanserv/extcmd.c
+@@ -53,6 +53,7 @@
+  *      written permission.
+  */
+ #include <config.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+@@ -61,8 +62,13 @@
+ #elif defined(HAVE_SYS_ETHERNET_H)
+ #include <sys/ethernet.h>
+ #else
++#if defined (__NetBSD__)
++#include <net/if.h>
++#include <net/if_ether.h>
++#else
+ #error "either netinet/ether.h or sys/ethernet.h must exist."
+ #endif
++#endif
+ #include <ctype.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -73,6 +79,53 @@
+ #include <OpenIPMI/serv.h>
+ #include <OpenIPMI/extcmd.h>
+ 
++/*
++ * These two functions (ether_aton_r() and ether_ntoa_r()
++ * were obtained from FreeBSD and modified for NetBSD
++ */
++
++#ifndef ether_aton_r
++/*
++ * Convert an ASCII representation of an ethernet address to binary form.
++ */
++struct ether_addr *
++ether_aton_r(const char *a, struct ether_addr *e)
++{
++        int i;
++        unsigned int o0, o1, o2, o3, o4, o5;
++
++        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
++        if (i != 6)
++                return (NULL);
++        e->ether_addr_octet[0]=o0;
++        e->ether_addr_octet[1]=o1;
++        e->ether_addr_octet[2]=o2;
++        e->ether_addr_octet[3]=o3;
++        e->ether_addr_octet[4]=o4;
++        e->ether_addr_octet[5]=o5;
++        return (e);
++}
++#endif
++
++#ifndef ether_ntoa_r
++/*
++ * Convert a binary representation of an ethernet address to an ASCII string.
++ */
++char *
++ether_ntoa_r(const struct ether_addr *n, char *a)
++{
++        int i;
++
++        i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->ether_addr_octet[0],
++            n->ether_addr_octet[1], n->ether_addr_octet[2],
++	    n->ether_addr_octet[3], n->ether_addr_octet[4],
++	    n->ether_addr_octet[5]);
++        if (i < 17)
++                return (NULL);
++        return (a);
++}
++#endif
++
+ static int
+ extcmd_getval(void *baseloc, extcmd_info_t *t, char *val)
+ {
diff --git a/openipmi/patches/patch-unix_selector.c b/openipmi/patches/patch-unix_selector.c
new file mode 100644
index 0000000000..bea2b41a41
--- /dev/null
+++ b/openipmi/patches/patch-unix_selector.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Testy for EBADFD on respective platforms only.
+
+--- unix/selector.c.orig	2020-10-08 11:19:47.295098497 +0000
++++ unix/selector.c
+@@ -1030,7 +1030,11 @@ process_fds(struct selector_s	    *sel,
+ 		  &tmp_except_set,
+ 		  &ts, &sigmask);
+     if (err < 0) {
++#if defined(EBADFD)
+ 	if (errno == EBADF || errno == EBADFD)
++#else
++	if (errno == EBADF)
++#endif
+ 	    /* We raced, just retry it. */
+ 	    goto retry;
+ 	goto out;


Home | Main Index | Thread Index | Old Index