Attachment 146070 Details for Bug 192853 – patch for net-mgmt/wmi-client

[patch] patch for net-mgmt/wmi-client

wmi-client.diff (text/plain), 8.25 KB, created by KIKUCHI Koichiro on 2014-08-20 13:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: KIKUCHI Koichiro

Created: 2014-08-20 13:27:23 UTC

Size: 8.25 KB

patch

obsolete

>diff -uNr wmi-client.orig/Makefile wmi-client/Makefile
>--- wmi-client.orig/Makefile	2014-07-25 00:36:50.000000000 +0900
>+++ wmi-client/Makefile	2014-08-20 21:18:52.000000000 +0900
>@@ -1,27 +1,51 @@
> # 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
>-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
>-
>-CONFLICTS=		zenoss-3*
>-
>-USE_AUTOTOOLS=		autoconf:env
>-USE_PYTHON_BUILD=	yes
>-USES=			iconv gmake tar:bzip2
>-USE_LDCONFIG=		yes
>-
>-MAKEFILE=		GNUmakefile
>-MAKE_ENV=		ZENHOME="${PREFIX}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}" PYTHON="${PYTHON_CMD}"
>-ALL_TARGET=		build
>+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
>+
>+MAINTAINER=	koichiro@rworks.jp
>+COMMENT=	DCOM/WMI client implementation
>+
>+OPTIONS_DEFINE=	PYTHON
>+PYTHON_DESC=	Build Python bindings
>+
>+USE_AUTOTOOLS=	autoconf:env autoheader:env
>+USES=		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}
>+USE_PYTHON_BUILD=yes
>+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
> 
>-NO_STAGE=	yes
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -uNr wmi-client.orig/files/patch-GNUmakefile wmi-client/files/patch-GNUmakefile
>--- wmi-client.orig/files/patch-GNUmakefile	2014-01-23 02:40:44.000000000 +0900
>+++ wmi-client/files/patch-GNUmakefile	2014-08-20 19:05:45.000000000 +0900
>@@ -1,6 +1,6 @@
>---- GNUmakefile.orig	2011-12-23 13:58:36.000000000 +0000
>-+++ GNUmakefile	2012-04-13 04:10:44.000000000 +0000
>-@@ -36,7 +36,7 @@
>+--- GNUmakefile.orig	2011-12-23 22:58:36.000000000 +0900
>++++ GNUmakefile	2014-08-20 19:04:28.000000000 +0900
>+@@ -36,7 +36,7 @@ endif
>  # 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)
>  #
>@@ -9,7 +9,7 @@
>  
>  #-------------------------------------------------------------------------#
>  # A key deliverable of this build process is the libasync_wmi shared      #
>-@@ -70,7 +70,7 @@
>+@@ -70,7 +70,7 @@ PATHED_LIBASYNC_WMI_LIB     := $(SAMBA_S
>  #-------------------------------------------------------------------------#
>  # Comment out the next line to disable google-breakpad dependency.
>  ifneq ($(shell uname), Darwin)
>@@ -18,12 +18,28 @@
>  endif
>  
>  ifneq ($(USE_BREAKPAD),)
>-@@ -158,7 +158,7 @@
>+@@ -124,7 +124,7 @@ ifneq ($(USE_BREAKPAD),)
>+ endif
>+ 	@touch $@
>+ 
>+-install-prereqs:
>++install-prereqs: $(DESTDIR)$(PY_LIBDIR)
>+ 	@echo
>+ 	@echo "Checking prequisites for installing WMI"
>+ 	$(call check,directory,$(ZENHOME),"ZENHOME")
>+@@ -158,12 +158,12 @@ endif
>  $(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 --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 -uNr wmi-client.orig/files/patch-Samba_source_winexe_service.c wmi-client/files/patch-Samba_source_winexe_service.c
>--- wmi-client.orig/files/patch-Samba_source_winexe_service.c	1970-01-01 09:00:00.000000000 +0900
>+++ wmi-client/files/patch-Samba_source_winexe_service.c	2014-08-19 11:51:57.000000000 +0900
>@@ -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 -uNr wmi-client.orig/pkg-plist wmi-client/pkg-plist
>--- wmi-client.orig/pkg-plist	2014-01-23 00:16:56.000000000 +0900
>+++ wmi-client/pkg-plist	2014-08-19 21:02:20.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 192853: 146070 | 146071 | 146072 | 146073 | 146074 | 146076 | 146111 | 146112 | 146113