Resolved merge conflict by incorporating both suggestions.

.travis.yml

@@ -1,13 +1,14 @@
 branches:
   only:
   - master
+  - xmppmaster
 before_install:
 - sudo sh -c "echo 'deb https://git.siveo.net xmppmaster mmc-core' > /etc/apt/sources.list.d/pulse.list"
 - sudo wget -qO - https://git.siveo.net/pubkey.txt | sudo apt-key add -
 - sudo apt-get update -qq
 - sudo apt-get install -y python-sqlalchemy python-mysqldb python-twisted-web python-ldap
   python-gobject xsltproc docbook-xsl dh-autoreconf apt-transport-https
-- sudo apt-get install -y python-mmc-core 
+- sudo apt-get install -y python-mmc-core
 install: sh autogen.sh && ./configure && make && sudo make install
 script:
 - echo "DONE"

ChangeLog

@@ -1,3 +1,16 @@
+Pulse 2 4.1
+=============
+* [FEATURE] New interface for building complex packages and workflows with dependencies
+* [FEATURE] New history view that captures all operations
+* [FEATURE] Pulse update module widget is now a standalone widget
+* [FEATURE] Create and run custom quick actions
+* [FEATURE] Ability to delay the execution step of deployments based on time, percentage or number of machines having received the package
+* [FEATURE] Add support for UEFI in the DHCP server configuration for Pulse imaging
+* [BUGFIX] Fix saving of sysprep answer files
+* [BUGFIX] Fix the abortion of deployments
+* [BUGFIX] Fix authentication to GLPI for user provisioning
+* [BUGFIX] Fix multicast imaging in Debian Stretch
+
 Pulse 2 4.0
 =============
  * [FEATURE] Use xmpp to deliver messages, orders, etc
@@ -7,6 +20,7 @@ Pulse 2 4.0
  online, offline) 
  * [BUGFIX]  Fix Antivirus detection with latest glpi
  * [BUGFIX]  Fix user creation with latest glpi
+ * [BUGFIX]  Fix port to php7
 
 Pulse 2 3.6.0
 =============
@@ -60,5 +74,3 @@ Pulse 2 3.3.0
  * [FEATURE] Management of multiple entities in Imaging
  * [BUGFIX]  Fix restore of a specific version of a file
  * [FEATURE] Replacement of historic Pulse PXE by PXELINUX
-
-

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.11
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -32,20 +32,19 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Pulse
+PROJECT_NAME           = "Pulse"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.9.90 
+PROJECT_NUMBER         = "3.9.93"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = 
-
+PROJECT_BRIEF          =  Pulse is a radically simple IT automation and lifecycle management tool that offers the ability to handle repetitive tasks, quickly deploy applications, operating system and proactively manage them all where ever they are.
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
@@ -303,6 +302,15 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -426,7 +434,7 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@@ -804,8 +812,8 @@ INPUT_ENCODING         = UTF-8
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
-# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -2399,6 +2407,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      = 
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      = 
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 

build_sdist.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION='4.0'
+VERSION='4.1'
 
 rm -f pulse2-*.tar.gz pulse2-*.tar.gz.md5
 git clean -fdx && ./autogen.sh && ./configure --sysconfdir=/etc --localstatedir=/var --disable-python-check --disable-conf && make distcheck

configure.ac

@@ -22,7 +22,7 @@ AC_PREREQ(2.59)
 
 dnl autoconf initialization
 define([project], [pulse2])
-AC_INIT(project, [4.0], [http://www.siveo.org])
+AC_INIT(project, [4.1], [http://www.siveo.org])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST

debian/control

@@ -221,17 +221,6 @@ Description: Pulse 2 / MBS BackupPC plugin for MMC agent
  .
  This package contains the BackupPC plugin for MMC agent.
 
-Package: python-mmc-update
-Architecture: all
-Section: python
-Depends: ${misc:Depends}, ${python:Depends}, pulse2-common(= ${binary:Version}), pulse-update-manager
-Description: Pulse 2 plugin to manage security updates (Linux, Windows Update)
- Pulse 2 is Open Source computer system management for medium and large
- organizations.
- .
- This package contains the update plugin to handle security updates
- (Windows Updates, Linux packages) within Pulse.
-
 Package: python-mmc-support
 Architecture: all
 Section: python
@@ -373,16 +362,6 @@ Description: Pulse 2 / MBS monitoring plugin for MMC web interface
  .
  This package contains the monitoring plugin for the MMC web interface.
 
-Package: mmc-web-update
-Architecture: all
-Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1)
-Description: Pulse 2 plugin to manage security updates (Linux, Windows Update)
- Pulse 2 is Open Source computer system management for medium and large
- organizations.
- .
- This package contains the update plugin to handle security updates
- (Windows Updates, Linux packages) within Pulse.
-
 Package: mmc-web-support
 Architecture: all
 Depends: ${misc:Depends}, pulse2-common(= ${binary:Version}), mmc-web-base (>= 3.1.1-1)

debian/pulse2-common.install

@@ -6,6 +6,7 @@ usr/sbin/pulse2-setup
 usr/sbin/pulse2-create-group
 usr/sbin/pulse2-load-defaults
 usr/sbin/pulse2-create-group
+usr/sbin/restart-pulse-services
 var/lib/pulse2/clients/win32
 var/lib/pulse2/clients/templates/
 var/lib/pulse2/clients/create-repos.sh

debian/pulse2.postinst

@@ -19,8 +19,10 @@ set -e
 
 case "$1" in
     configure)
-	cd /usr/lib/systemd/system/
-     	for service in $(ls mmc-agent.service pulse2-*); do systemctl restart $service; done
+	if [ ! -e "/tmp/pulse-update-manager" ]; then
+		cd /usr/lib/systemd/system/
+     		for service in $(ls mmc-agent.service pulse2-*); do systemctl restart $service; done
+	fi
 
     ;;
 

packaging/rpm/rhel/SOURCES/disable-doc.patch

@@ -0,0 +1,19 @@
+commit 3cee6b56c6df129cd70cec9748f98738e845ee75
+Author: Nicolas Lécureuil <neoclust@mageia.org>
+Date:   Mon Sep 25 15:53:21 2017 +0200
+
+    Disable doc folder for the moment
+
+diff --git a/Makefile.am b/Makefile.am
+index 430e3dd59..61cd46856 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,7 +23,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ DISTCHECK_CONFIGURE_FLAGS=--disable-conf-backup --disable-python-check
+
+-SUBDIRS = web services doc
++SUBDIRS = web services
+
+ backupext = .$(shell date +%Y-%m-%d+%H:%M:%S)
+

packaging/rpm/rhel/SPECS/pulse2.spec

@@ -8,16 +8,16 @@
 
 %define use_git                1
 %define git                    SHA
-%define real_version           4.0
-%define mmc_version            3.1.0
+%define real_version           4.1
+%define mmc_version            4.1
 
 Summary:	Management Console
 Name:		pulse2
 Version:	%real_version
 %if ! %use_git
 Release:        1%{?dist}
 %else
-Release:        2.%git.1%{?dist}
+Release:        0.%git.1%{?dist}
 %endif
 License:	GPL
 Group:		System/Servers
@@ -240,36 +240,6 @@ deployment process.
 
 #--------------------------------------------------------------------
 
-%package -n     mmc-web-update
-Summary:        Pulse 2 plugin to manage security updates (Linux, Windows Update)
-Group:          System/Servers
-Requires:       pulse2-common = %version-%release
-Requires:       mmc-web-base >= %mmc_version
-
-%description -n mmc-web-update
-This package contains the update plugin to handle security updates
-(Windows Updates, Linux packages) within Pulse.
-
-%files -n mmc-web-update
-%{_datadir}/mmc/modules/update
-
-#--------------------------------------------------------------------
-
-%package -n python-mmc-update
-Summary:    Pulse 2 plugin to manage security updates (Linux, Windows Update)
-Group:      System/Servers
-Requires:   pulse2-common = %version-%release
-
-%description -n python-mmc-update
-This package contains the update plugin to handle security updates
-(Windows Updates, Linux packages) within Pulse.
-
-%files -n python-mmc-update
-%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/mmc/plugins/update.ini
-%python2_sitelib/mmc/plugins/update
-
-#--------------------------------------------------------------------
-
 %package -n python-mmc-imaging
 Summary:    Imaging plugin for MMC agent
 Group:      System/Servers
@@ -499,6 +469,7 @@ This package contains Pulse 2 common files like documentation.
 %{_sbindir}/pulse2-dbupdate
 %{_sbindir}/pulse2-debug
 %{_sbindir}/pulse2-collect-info
+%{_sbindir}/restart-pulse-services
 %{_var}/lib/pulse2/clients
 %_docdir/mmc/contrib/
 %_datadir/mmc/conf/apache/pulse.conf

scripts/tx-pull-pulse.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script maps PO and POT files to transifex ressources
+# on https://www.transifex.com
+
+SCRIPT_PROJECT=`pwd`
+
+which tx > /dev/null
+if [ $? -ne 0 ]; then
+	echo "Install the transifex client v0.4 (pip install transifex-client==0.4)"
+	exit 1
+fi
+
+test -d .tx || tx init --host=https://www.transifex.com
+
+[ ! x$1 == x ] && lang="-l $1" && shift 1
+args=$@
+
+modules="dyngroup glpi imaging inventory msc pkgs pulse2 backuppc update support guacamole"
+
+for mod in $modules
+do
+	cd $SCRIPT_PROJECT/../web/modules/$mod/locale/
+	tx pull -f -r pulse-1.${mod} ${lang} ${args}
+done

scripts/tx-push-pulse.sh

@@ -20,5 +20,6 @@ modules="dyngroup glpi imaging inventory msc pkgs pulse2 backuppc update support
 for mod in $modules
 do
 	cd $SCRIPT_PROJECT/../web/modules/$mod/locale/
-	tx push -r pulse-1.${mod} -s -t -f --no-interactive
+	tx push -r pulse-1.${mod} -s -t 
+	#-f --no-interactive
 done

services/bin/Makefile.am

@@ -26,6 +26,7 @@ dist_sbin_SCRIPTS = pulse2-package-server pulse2-package-server-register-imaging
 	pulse2-backup-servers pulse2-debug pulse2-dbupdate \
 	pulse2-msc-clean-database pulse2-inventory-clean-database \
 	pulse2-collect-info pulse2-create-group pulse2-cm pulse2-register-pxe.py \
-	pulse2-connect-machine-backuppc pulse2-disconnect-machine-backuppc
+	pulse2-connect-machine-backuppc pulse2-disconnect-machine-backuppc \
+	restart-pulse-services
 
 dist_bin_SCRIPTS = pulse2-uuid-resolver pulse2-dlp-server pulse2-backup-handler pulse2-synch-masters