Attachment #146111 for bug #192853




# Created by: KIKUCHI Koichiro <koichiro@rworks.jp>
# $FreeBSD: head/net-mgmt/wmi-client/Makefile 362806 2014-07-24 15:36:50Z bapt $

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=	koichiro@rworks.jp
COMMENT=	DCOM/WMI client implementation

OPTIONS_DEFINE=	PYTHON
PYTHON_DESC=	Build Python bindings

USE_AUTOTOOLS=	autoconf:env autoheader:env
USES=		iconv gmake tar:bzip2

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

.include <bsd.port.pre.mk>

.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

.include <bsd.port.post.mk>
.include <bsd.port.mk>




--- 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)

 endif
 
 ifneq ($(USE_BREAKPAD),)
@@ -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)" SMB_GNUTLS=NO ./configure --prefix=$(PREFIX) --without-readline
 
 ifeq ($(USE_BREAKPAD),)
-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) ;\

Line 0 Link Here

(-)wmi-client/files/patch-Samba_source_winexe_service.c (+11 lines)
	1	--- Samba/source/winexe/service.c.orig 2012-11-06 19:39:54.144961557 +0900
	2	+++ Samba/source/winexe/service.c 2012-11-06 19:37:01.500708620 +0900
	3	@@ -15,7 +15,7 @@
	4	#define SERVICE_DEMAND_START (0x00000003)
	5	#define SERVICE_ERROR_NORMAL (0x00000001)
	6	#define SERVICE_CONTROL_STOP (0x00000001)
	7	-#define NT_STATUS_SERVICE_DOES_NOT_EXIST NT_STATUS(0xc0000424)
	8	+#define NT_STATUS_SERVICE_DOES_NOT_EXIST NT_STATUS(0x00000424)
	9	#include "system/filesys.h"
	10	#include "libcli/libcli.h"
	11	#include "libcli/smb_composite/smb_composite.h"




bin/winexe
bin/wmic
%%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

Return to bug 192853

Lines 1-27 Link Here

(-)wmi-client/Makefile (-23 / +48 lines)
1	# Created by: KIKUCHI Koichiro <koichiro@rworks.jp>	1	# Created by: KIKUCHI Koichiro <koichiro@rworks.jp>
2	# $FreeBSD: head/net-mgmt/wmi-client/Makefile 362806 2014-07-24 15:36:50Z bapt $	2	# $FreeBSD: head/net-mgmt/wmi-client/Makefile 362806 2014-07-24 15:36:50Z bapt $
3		3
4	PORTNAME= wmi	4	PORTNAME= wmi
5	PORTVERSION= 1.3.16	5	PORTVERSION= 1.3.16
6	CATEGORIES= net-mgmt	6	PORTREVISION= 1
7	MASTER_SITES= http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \	7	CATEGORIES= net-mgmt
8	http://www.openvas.org/download/wmi/ \	8	MASTER_SITES= http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
9	http://mirrors.rit.edu/zi/	9	http://www.openvas.org/download/wmi/ \
10	PKGNAMESUFFIX= -client	10	http://mirrors.rit.edu/zi/
11		11	PKGNAMESUFFIX= -client
12	MAINTAINER= ports@FreeBSD.org	12
13	COMMENT= DCOM/WMI client implementation	13	MAINTAINER= koichiro@rworks.jp
14		14	COMMENT= DCOM/WMI client implementation
15	CONFLICTS= zenoss-3*	15
16		16	OPTIONS_DEFINE= PYTHON
17	USE_AUTOTOOLS= autoconf:env	17	PYTHON_DESC= Build Python bindings
18	USE_PYTHON_BUILD= yes	18
19	USES= iconv gmake tar:bzip2	19	USE_AUTOTOOLS= autoconf:env autoheader:env
20	USE_LDCONFIG= yes	20	USES= iconv gmake tar:bzip2
21		21
22	MAKEFILE= GNUmakefile	22	MAKEFILE= GNUmakefile
23	MAKE_ENV= ZENHOME="${PREFIX}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}" PYTHON="${PYTHON_CMD}"	23	MAKE_ARGS+= ZENHOME="${PREFIX}"
24	ALL_TARGET= build	24	ALL_TARGET= build
		25
		26	PROGS= bin/wmic bin/winexe
		27
		28	.include <bsd.port.options.mk>
		29
		30	.if ${PORT_OPTIONS:MPYTHON}
		31	USES+= python
		32	MAKE_ARGS+= PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
		33	PLIST_SUB+= PYTHON=""
		34	.else
		35	PLIST_SUB+= PYTHON="@comment "
		36	.endif
		37
		38	.include <bsd.port.pre.mk>
		39
		40	.if ${PORT_OPTIONS:MPYTHON}
		41	post-install:
		42	.for x in ${PROGS:S,^,${PREFIX}/,} ${PYTHONPREFIX_SITELIBDIR}/libasync_wmi_lib.so.0.0.2
		43	@${STRIP_CMD} ${STAGEDIR}${x}
		44	.endfor
		45	.else
		46	do-install:
		47	.for x in ${PROGS}
		48	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}
		49	.endfor
		50	.endif
25		51
26	NO_STAGE= yes	52	.include <bsd.port.post.mk>
27	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)wmi-client/files/patch-GNUmakefile (-5 / +21 lines)
1	--- GNUmakefile.orig 2011-12-23 13:58:36.000000000 +0000	1	--- GNUmakefile.orig 2011-12-23 22:58:36.000000000 +0900
2	+++ GNUmakefile 2012-04-13 04:10:44.000000000 +0000	2	+++ GNUmakefile 2014-08-21 13:05:52.000000000 +0900
3	@@ -36,7 +36,7 @@	3	@@ -36,7 +36,7 @@
4	# Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.	4	# Install dir for libasync_wmi_lib.so.* and pysamba wrapper code.
5	# e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)	5	# e.g., Samba/source/bin/shared/libasync_wmi_lib.so.0.0.1 --> $(PY_LIBDIR)
Lines 18-29 Link Here
18	endif	18	endif
19		19
20	ifneq ($(USE_BREAKPAD),)	20	ifneq ($(USE_BREAKPAD),)
21	@@ -158,7 +158,7 @@	21	@@ -124,7 +124,7 @@
		22	endif
		23	@touch $@
		24
		25	-install-prereqs:
		26	+install-prereqs: $(DESTDIR)$(PY_LIBDIR)
		27	@echo
		28	@echo "Checking prequisites for installing WMI"
		29	$(call check,directory,$(ZENHOME),"ZENHOME")
		30	@@ -157,12 +157,12 @@
22	$(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh	31	$(SAMBA_SRCDIR)/Makefile: $(SAMBA_SRCDIR)/autogen.sh
23	cd $(SAMBA_SRCDIR) ;\	32	cd $(SAMBA_SRCDIR) ;\
24	./autogen.sh ;\	33	./autogen.sh ;\
25	- CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug	34	- CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug
26	+ CPPFLAGS="$(WMI_CPPFLAGS)" ./configure --without-readline --enable-debug --disable-gnutls	35	+ CPPFLAGS="$(WMI_CPPFLAGS)" SMB_GNUTLS=NO ./configure --prefix=$(PREFIX) --without-readline
27		36
28	ifeq ($(USE_BREAKPAD),)	37	ifeq ($(USE_BREAKPAD),)
29	pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile	38	-pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
		39	+pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile
		40	else
		41	-pywmi-build: build-prereqs $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
		42	+pywmi-build: $(LIBRPC_CONFIG_MK) $(SAMBA_SRCDIR)/Makefile $(breakpad_LIB_SYMLINK)
		43	endif
		44	cd $(SAMBA_SRCDIR);\
		45	$(MAKE) $(WMI_BUILD_TARGETS) ;\

Lines 1-31 Link Here

(-)wmi-client/pkg-plist (-29 / +29 lines)
1	bin/winexe	1	bin/winexe
2	bin/wmic	2	bin/wmic
3	%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0	3	%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0
4	%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2	4	%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2
5	%%PYTHON_SITELIBDIR%%/pysamba/talloc.py	5	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/talloc.py
6	%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py	6	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py
7	%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py	7	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py
8	%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py	8	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py
9	%%PYTHON_SITELIBDIR%%/pysamba/__init__.py	9	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/__init__.py
10	%%PYTHON_SITELIBDIR%%/pysamba/version.pyc	10	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.pyc
11	%%PYTHON_SITELIBDIR%%/pysamba/library.py	11	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/library.py
12	%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py	12	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py
13	%%PYTHON_SITELIBDIR%%/pysamba/version.py	13	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.py
14	%%PYTHON_SITELIBDIR%%/pysamba/ndr.py	14	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/ndr.py
15	%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py	15	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py
16	%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py	16	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py
17	%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py	17	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py
18	%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py	18	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py
19	%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py	19	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py
20	%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py	20	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py
21	%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py	21	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py
22	%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py	22	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py
23	%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py	23	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py
24	%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py	24	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
25	%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py	25	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
26	%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py	26	%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py
27	@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/wbem	27	%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/wbem
28	@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/twisted	28	%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/twisted
29	@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/test	29	%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/test
30	@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/rpc	30	%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/rpc
31	@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba	31	%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba