diff options
| -rw-r--r-- | libvirt-php-0.4.5.tar.gz | bin | 234636 -> 0 bytes | |||
| -rw-r--r-- | libvirt-php54.patch | 214 | ||||
| -rw-r--r-- | php-libvirt.spec | 41 |
3 files changed, 20 insertions, 235 deletions
diff --git a/libvirt-php-0.4.5.tar.gz b/libvirt-php-0.4.5.tar.gz Binary files differdeleted file mode 100644 index 03f7c25..0000000 --- a/libvirt-php-0.4.5.tar.gz +++ /dev/null diff --git a/libvirt-php54.patch b/libvirt-php54.patch deleted file mode 100644 index 3b493cd..0000000 --- a/libvirt-php54.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff -up libvirt-php-0.4.5/src/libvirt-php.c.php54 libvirt-php-0.4.5/src/libvirt-php.c ---- libvirt-php-0.4.5/src/libvirt-php.c.php54 2011-11-27 16:49:11.201682937 +0100 -+++ libvirt-php-0.4.5/src/libvirt-php.c 2011-11-27 17:05:24.092827417 +0100 -@@ -16,6 +16,11 @@ - - #include "libvirt-php.h" - -+// From vncfunc.c -+int vnc_get_dimensions(char *server, char *port, int *width, int *height); -+// From sockets.c -+int connect_socket(char *server, char *port, int keepalive, int nodelay, int allow_server_override); -+ - #ifdef DEBUG_CORE - #define DPRINTF(fmt, ...) \ - if (LIBVIRT_G(debug)) \ -@@ -50,7 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_c - ZEND_ARG_INFO(0, readonly) - ZEND_END_ARG_INFO() - --static function_entry libvirt_functions[] = { -+static zend_function_entry libvirt_functions[] = { - /* Common functions */ - PHP_FE(libvirt_get_last_error,NULL) - /* Connect functions */ -@@ -775,7 +780,7 @@ unsigned long long size_def_to_mbytes(ch - return 0; - - unit = arg[strlen(arg)-1]; -- switch (arg[strlen(arg)-1]) { -+ switch (unit) { - case 'G': - multiplicator = 1 << 10; - break; -@@ -1419,7 +1424,7 @@ PHP_FUNCTION(libvirt_connect) - if (zend_hash_get_current_key_ex(arr_hash, &key, &key_len, &index, 0, &pointer) == HASH_KEY_IS_STRING) { - PHPWRITE(key, key_len); - } else { -- DPRINTF("%s: credentials index %d\n", PHPFUNC, index); -+ DPRINTF("%s: credentials index %d\n", PHPFUNC, (int)index); - creds[j].type=index; - creds[j].result=emalloc( Z_STRLEN_PP(data) + 1 ); - memset(creds[j].result, 0, Z_STRLEN_PP(data) + 1); -@@ -1623,7 +1628,7 @@ PHP_FUNCTION(libvirt_image_create) - zval *zconn; - char msg[1024]; - char cmd[4096] = { 0 }; -- char *path; -+ char *path = NULL; - char fpath[4096] = { 0 }; - char *image = NULL; - int image_len; -@@ -1965,7 +1970,7 @@ void dec_to_bin(unsigned long long decim - int k = 0, n = 0; - int neg_flag = 0; - int remain; -- int old_decimal; -+ // int old_decimal; - char temp[128] = { 0 }; - - if (decimal < 0) -@@ -1975,7 +1980,7 @@ void dec_to_bin(unsigned long long decim - } - do - { -- old_decimal = decimal; -+ // old_decimal = decimal; - remain = decimal % 2; - decimal = decimal / 2; - temp[k++] = remain + '0'; -@@ -2050,7 +2055,7 @@ long get_next_free_numeric_value(virDoma - int retval = -1; - HashTable *arr_hash; - HashPosition pointer; -- int array_count; -+ // int array_count; - zval **data; - char *key; - unsigned int key_len; -@@ -2063,7 +2068,7 @@ long get_next_free_numeric_value(virDoma - free( get_string_from_xpath(xml, xpath, &output, &retval) ); - - arr_hash = Z_ARRVAL_P(output); -- array_count = zend_hash_num_elements(arr_hash); -+ // array_count = zend_hash_num_elements(arr_hash); - for (zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); - zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS; - zend_hash_move_forward_ex(arr_hash, &pointer)) { -@@ -2188,7 +2193,7 @@ char *connection_get_arch(virConnectPtr - int retval = -1; - char *tmp = NULL; - char *caps = NULL; -- char xpath[1024] = { 0 }; -+ // char xpath[1024] = { 0 }; - - caps = virConnectGetCapabilities(conn); - if (caps == NULL) -@@ -2219,7 +2224,7 @@ char *generate_uuid_any() - int i; - char a[37] = { 0 }; - char hexa[] = "0123456789abcdef"; -- virDomainPtr domain=NULL; -+ // virDomainPtr domain=NULL; - - srand(time(NULL)); - for (i = 0; i < 36; i++) { -@@ -2304,7 +2309,7 @@ char *get_disk_xml(unsigned long long si - ret = WEXITSTATUS(system(cmd)); - DPRINTF("%s: Command '%s' finished with error code %d\n", __FUNCTION__, cmd, ret); - if (ret != 0) { -- DPRINTF("%s: File creation failed\n"); -+ DPRINTF("%s: File creation failed\n", path); - return NULL; - } - -@@ -2387,7 +2392,7 @@ char *installation_get_xml(int step, vir - char features[128] = { 0 }; - char *tmp = NULL; - char type[64] = { 0 }; -- virDomainPtr domain=NULL; -+ // virDomainPtr domain=NULL; - - if (conn == NULL) { - DPRINTF("%s: Invalid libvirt connection pointer\n", __FUNCTION__); -@@ -2978,7 +2983,7 @@ PHP_FUNCTION(libvirt_domain_send_keys) - - GET_DOMAIN_FROM_ARGS("rss",&zdomain, &hostname, &hostname_len, &keys, &keys_len); - -- DPRINTF("%s: Sending %d VNC keys to %s...\n", PHPFUNC, strlen(keys), hostname); -+ DPRINTF("%s: Sending %d VNC keys to %s...\n", PHPFUNC, (int)strlen(keys), hostname); - - xml=virDomainGetXMLDesc(domain->domain, 0); - if (xml==NULL) { -@@ -2992,7 +2997,7 @@ PHP_FUNCTION(libvirt_domain_send_keys) - RETURN_FALSE; - } - -- DPRINTF("%s: About to send string '%s' (%d keys) to %s:%s\n", PHPFUNC, keys, strlen(keys), hostname, tmp); -+ DPRINTF("%s: About to send string '%s' (%d keys) to %s:%s\n", PHPFUNC, keys, (int)strlen(keys), hostname, tmp); - - ret = vnc_send_keys(hostname, tmp, keys); - DPRINTF("%s: Sequence sending result is %d\n", PHPFUNC, ret); -@@ -3214,15 +3219,15 @@ PHP_FUNCTION(libvirt_connect_get_emulato - void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) - { - HashTable *arr_hash; -- int array_count; -- zval **zvalue, **data; -+ // int array_count; -+ zval **data; // removed **zvalue - HashPosition pointer; - char *key; - unsigned int key_len; - unsigned long index; - - arr_hash = Z_ARRVAL_P(arr); -- array_count = zend_hash_num_elements(arr_hash); -+ //array_count = zend_hash_num_elements(arr_hash); - - if (disk != NULL) - memset(disk, 0, sizeof(tVMDisk)); -@@ -3297,7 +3302,7 @@ PHP_FUNCTION(libvirt_domain_new) - char *tmp; - char *name; - char name_len=0; -- char *emulator; -+ // char *emulator; - char *iso_image = NULL; - int iso_image_len; - int vcpus = -1; -@@ -3308,7 +3313,7 @@ PHP_FUNCTION(libvirt_domain_new) - int maxmemMB = -1; - HashTable *arr_hash; - int numDisks, numNets, i; -- zval **zvalue, **data; -+ zval **data; // removed **zvalue - HashPosition pointer; - char vncl[2048] = { 0 }; - char tmpname[1024] = { 0 }; -@@ -3677,7 +3682,7 @@ PHP_FUNCTION(libvirt_domain_change_memor - long allocMem = 0; - long allocMax = 0; - int retval = -1; -- int pos = -1; -+ // int pos = -1; - int len = 0; - php_libvirt_domain *res_domain = NULL; - php_libvirt_connection *conn = NULL; -@@ -3703,7 +3708,7 @@ PHP_FUNCTION(libvirt_domain_change_memor - snprintf(new, sizeof(new), " <memory>%d</memory>\n <currentMemory>%d</currentMemory>\n", allocMax, allocMem); - tmpA = strstr(xml, "<memory>"); - tmp1 = strstr(xml, "</currentMemory>") + strlen("</currentMemory>"); -- pos = strlen(xml) - strlen(tmp1); -+ // pos = strlen(xml) - strlen(tmp1); - len = strlen(xml) - strlen(tmpA); - - tmp2 = emalloc( ( len + 1 )* sizeof(char) ); -@@ -3770,7 +3775,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_ - char *second = NULL; - int second_len; - int retval = -1; -- int pos = -1; -+ // int pos = -1; - int len = 0; - php_libvirt_domain *res_domain = NULL; - php_libvirt_connection *conn = NULL; -@@ -3793,7 +3798,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_ - - tmpA = strstr(xml, "</type>") + strlen("</type>"); - tmp1 = strstr(xml, "</os>"); -- pos = strlen(xml) - strlen(tmp1); -+ // pos = strlen(xml) - strlen(tmp1); - len = strlen(xml) - strlen(tmpA); - - tmp2 = emalloc( ( len + 1 )* sizeof(char) ); diff --git a/php-libvirt.spec b/php-libvirt.spec index af3f2e9..8f60950 100644 --- a/php-libvirt.spec +++ b/php-libvirt.spec @@ -1,5 +1,6 @@ %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__php: %global __php %{_bindir}/php} +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global req_libvirt_version 0.6.2 %global extname libvirt-php @@ -14,9 +15,6 @@ License: PHP URL: http://libvirt.org/php Source0: http://libvirt.org/sources/php/libvirt-php-%{version}.tar.gz -# https://www.redhat.com/archives/libvir-list/2011-November/msg01476.html -Patch0: libvirt-php54.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php-devel BuildRequires: libvirt-devel >= %{req_libvirt_version} @@ -29,6 +27,13 @@ Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +%if 0%{?fedora} < 20 +# Filter shared private +%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} +%{?filter_setup} +%endif + + %description PHP language bindings for Libvirt API. For more details see: http://www.libvirt.org/php/ @@ -49,35 +54,29 @@ For more details see: http://www.libvirt.org/php/ http://www.php.net/ This package contain the document for php-libvirt. -%if 0%{?fedora} < 20 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - %prep %setup -q -n libvirt-php-%{version} %build -%configure --with-html-dir=%{_datadir}/doc \ - --with-html-subdir=%{name}-%{version}/html \ - --libdir=%{php_extdir} +%configure \ + --with-html-dir=%{_docdir} \ + --with-html-subdir=$(echo %{_pkgdocdir} | sed -e 's|^%{_docdir}/||')/html \ + --libdir=%{php_extdir} make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} - +install -pm 644 COPYING %{buildroot}%{_pkgdocdir} chmod +x %{buildroot}%{php_extdir}/%{extname}.so %check -# simple module load test +: simple module load test %{__php} --no-php-ini \ - --define extension=src/%{extname}.so \ + --define extension=%{buildroot}%{php_extdir}/%{extname}.so \ --modules | grep libvirt @@ -87,21 +86,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc +%dir %{_pkgdocdir} +%{_pkgdocdir}/COPYING %{php_extdir}/%{extname}.so %config(noreplace) %{php_inidir}/%{extname}.ini %files -n php-libvirt-doc %defattr(-,root,root,-) -%doc README -%dir %{_datadir}/doc/%{name}-%{version} -%{_datadir}/doc/%{name}-%{version}/html +%{_pkgdocdir}/html %changelog * Mon Jan 6 2014 Remi Collet <remi@fedoraproject.org> - 0.4.8-1 - update to 0.4.8 +- spec cleanups * Tue Jan 8 2013 Remi Collet <remi@fedoraproject.org> - 0.4.5-2 - rebuild @@ -145,5 +144,5 @@ rm -rf %{buildroot} * Thu Mar 10 2011 Michal Novotny <minovotn@redhat.com> - 0.4.1-2 - Changes done to comply with Fedora package policy -* Tue Feb 8 2011 Michal Novotny <minovotn@redhat.com> - 0.4.1-1 +* Tue Feb 8 2011 Michal Novotny <minovotn@redhat.com> - 0.4.1-1 - Initial commit (from github) |