aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt/wmi-client
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-08-23 16:38:43 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-08-23 16:38:43 +0000
commitd6436f18881a064a80da91617c3243e0bf97387b (patch)
treeb7aa70a2805e0de5683c0fec62d602b1a8a59fd7 /net-mgmt/wmi-client
parent1036b73ef2d8d09eddea302d8c0891879f3dc827 (diff)
downloadports-d6436f18881a064a80da91617c3243e0bf97387b.tar.gz
ports-d6436f18881a064a80da91617c3243e0bf97387b.zip
- Add STAGE support
- (re)take maintainership - Add patch to fix "Failed to install service" issue occurs in recent windows (see http://community.zenoss.org/message/48714) - Make python bindings optional. it's mainly used in ZENOSS internally and should be optional. PR: 192853 Submitted by: KIKUCHI Koichiro
Notes
Notes: svn path=/head/; revision=365756
Diffstat (limited to 'net-mgmt/wmi-client')
-rw-r--r--net-mgmt/wmi-client/Makefile59
-rw-r--r--net-mgmt/wmi-client/files/patch-GNUmakefile26
-rw-r--r--net-mgmt/wmi-client/files/patch-Samba_source_winexe_service.c11
-rw-r--r--net-mgmt/wmi-client/pkg-plist58
4 files changed, 102 insertions, 52 deletions
diff --git a/net-mgmt/wmi-client/Makefile b/net-mgmt/wmi-client/Makefile
index 96c48e78892b..f562fb229555 100644
--- a/net-mgmt/wmi-client/Makefile
+++ b/net-mgmt/wmi-client/Makefile
@@ -1,27 +1,50 @@
# Created by: KIKUCHI Koichiro <koichiro@rworks.jp>
# $FreeBSD$
-PORTNAME= wmi
-PORTVERSION= 1.3.16
-CATEGORIES= net-mgmt
-MASTER_SITES= http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
- http://www.openvas.org/download/wmi/ \
- http://mirrors.rit.edu/zi/
-PKGNAMESUFFIX= -client
+PORTNAME= wmi
+PORTVERSION= 1.3.16
+PORTREVISION= 1
+CATEGORIES= net-mgmt
+MASTER_SITES= http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
+ http://www.openvas.org/download/wmi/ \
+ http://mirrors.rit.edu/zi/
+PKGNAMESUFFIX= -client
-MAINTAINER= ports@FreeBSD.org
-COMMENT= DCOM/WMI client implementation
+MAINTAINER= koichiro@rworks.jp
+COMMENT= DCOM/WMI client implementation
-CONFLICTS= zenoss-3*
+OPTIONS_DEFINE= PYTHON
+PYTHON_DESC= Build Python bindings
-USE_AUTOTOOLS= autoconf:env
-USE_PYTHON_BUILD= yes
-USES= iconv gmake tar:bzip2
-USE_LDCONFIG= yes
+USE_AUTOTOOLS= autoconf:env autoheader:env
+USES= iconv gmake tar:bzip2
-MAKEFILE= GNUmakefile
-MAKE_ENV= ZENHOME="${PREFIX}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}" PYTHON="${PYTHON_CMD}"
-ALL_TARGET= build
+MAKEFILE= GNUmakefile
+MAKE_ARGS+= ZENHOME="${PREFIX}"
+ALL_TARGET= build
+
+PROGS= bin/wmic bin/winexe
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPYTHON}
+USES+= python
+MAKE_ARGS+= PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+post-install:
+.for x in ${PROGS:S,^,${PREFIX}/,} ${PYTHONPREFIX_SITELIBDIR}/libasync_wmi_lib.so.0.0.2
+ @${STRIP_CMD} ${STAGEDIR}${x}
+.endfor
+.else
+do-install:
+.for x in ${PROGS}
+ @${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}
+.endfor
+.endif
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/net-mgmt/wmi-client/files/patch-GNUmakefile b/net-mgmt/wmi-client/files/patch-GNUmakefile
index fde4eaa2b8fe..102b34a866a2 100644
--- a/net-mgmt/wmi-client/files/patch-GNUmakefile
+++ b/net-mgmt/wmi-client/files/patch-GNUmakefile
@@ -1,5 +1,5 @@
---- GNUmakefile.orig 2011-12-23 13:58:36.000000000 +0000
-+++ GNUmakefile 2012-04-13 04:10:44.000000000 +0000
+--- GNUmakefile.orig 2011-12-23 22:58:36.000000000 +0900
++++ GNUmakefile 2014-08-21 13:05:52.000000000 +0900
@@ -36,7 +36,7 @@
# Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.
# e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)
@@ -18,12 +18,28 @@
endif
ifneq ($(USE_BREAKPAD),)
-@@ -158,7 +158,7 @@
+@@ -124,7 +124,7 @@
+ endif
+ @touch $@
+
+-install-prereqs:
++install-prereqs: $(DESTDIR)$(PY_LIBDIR)
+ @echo
+ @echo "Checking prequisites for installing WMI"
+ $(call check,directory,$(ZENHOME),"ZENHOME")
+@@ -157,12 +157,12 @@
$(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh
cd $(SAMBA_SRCDIR) ;\
./autogen.sh ;\
- CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug
-+ CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug --disable-gnutls
++ CPPFLAGS="$(WMI_CPPFLAGS)" SMB_GNUTLS=NO ./configure --prefix=$(PREFIX) --without-readline
ifeq ($(USE_BREAKPAD),)
- pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
+-pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
++pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
+ else
+-pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
++pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
+ endif
+ cd $(SAMBA_SRCDIR);\
+ $(MAKE) $(WMI_BUILD_TARGETS) ;\
diff --git a/net-mgmt/wmi-client/files/patch-Samba_source_winexe_service.c b/net-mgmt/wmi-client/files/patch-Samba_source_winexe_service.c
new file mode 100644
index 000000000000..c9ee00384265
--- /dev/null
+++ b/net-mgmt/wmi-client/files/patch-Samba_source_winexe_service.c
@@ -0,0 +1,11 @@
+--- Samba/source/winexe/service.c.orig 2012-11-06 19:39:54.144961557 +0900
++++ Samba/source/winexe/service.c 2012-11-06 19:37:01.500708620 +0900
+@@ -15,7 +15,7 @@
+ #define SERVICE_DEMAND_START (0x00000003)
+ #define SERVICE_ERROR_NORMAL (0x00000001)
+ #define SERVICE_CONTROL_STOP (0x00000001)
+-#define NT_STATUS_SERVICE_DOES_NOT_EXIST NT_STATUS(0xc0000424)
++#define NT_STATUS_SERVICE_DOES_NOT_EXIST NT_STATUS(0x00000424)
+ #include "system/filesys.h"
+ #include "libcli/libcli.h"
+ #include "libcli/smb_composite/smb_composite.h"
diff --git a/net-mgmt/wmi-client/pkg-plist b/net-mgmt/wmi-client/pkg-plist
index 818c2de7e7d9..ba2b8558ed39 100644
--- a/net-mgmt/wmi-client/pkg-plist
+++ b/net-mgmt/wmi-client/pkg-plist
@@ -1,31 +1,31 @@
bin/winexe
bin/wmic
-%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0
-%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2
-%%PYTHON_SITELIBDIR%%/pysamba/talloc.py
-%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py
-%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py
-%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py
-%%PYTHON_SITELIBDIR%%/pysamba/__init__.py
-%%PYTHON_SITELIBDIR%%/pysamba/version.pyc
-%%PYTHON_SITELIBDIR%%/pysamba/library.py
-%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py
-%%PYTHON_SITELIBDIR%%/pysamba/version.py
-%%PYTHON_SITELIBDIR%%/pysamba/ndr.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py
-%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py
-%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py
-%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py
-%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py
-%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
-%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
-%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py
-@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/wbem
-@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/twisted
-@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/test
-@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/rpc
-@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/talloc.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/library.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/ndr.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/wbem
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/twisted
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/test
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/rpc
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 03:21:03 +0000