@@ -2,7 +2,7 @@

 Name:           cloud-init

 Version:        18.3

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -22,6 +22,7 @@ Patch6:         systemd-service-changes.patch

 Patch7:         makecheck.patch

 Patch8:         systemd-resolved-config.patch

 Patch9:         cloud-init-azureds.patch

+Patch10:        ds-identity.patch

 BuildRequires:  python3

 BuildRequires:  python3-libs

@@ -77,6 +78,7 @@ ssh keys and to let the user run various scripts.

 %patch7 -p1

 %patch8 -p1

 %patch9 -p1

+%patch10 -p1

 find systemd -name "cloud*.service*" | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

@@ -145,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Tue Dec 04 2018 Ajay Kaher <akaher@vmware.com> 18.3-2

+-   Fix auto startup at boot time

 *   Wed Oct 24 2018 Ajay Kaher <akaher@vmware.com> 18.3-1

 -   Upgraded version to 18.3

 *   Sun Oct 07 2018 Tapas Kundu <tkundu@vmware.com> 0.7.9-15

new file mode 100644

@@ -0,0 +1,12 @@

+diff -rupN cloud-init-18.3/tools/ds-identify cloud-init-18.3_ds-identity-fixed/tools/ds-identify

+--- cloud-init-18.3/tools/ds-identify	2018-06-20 00:19:26.000000000 +0000

+@@ -85,7 +85,7 @@ _DI_LOGGED=""

+ DI_MAIN=${DI_MAIN:-main}

+ 

+ DI_BLKID_OUTPUT=""

+-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"

++DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_ENABLED}"

+ DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"

+ DI_DMI_CHASSIS_ASSET_TAG=""

+ DI_DMI_PRODUCT_NAME=""

@@ -1,7 +1,7 @@

 Summary:	Docbook-xsl-1.79.1

 Name:		docbook-xsl

 Version:	1.79.1

-Release:	5%{?dist}

+Release:	6%{?dist}

 License:	Apache License

 URL:		http://www.docbook.org

 Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2

@@ -11,16 +11,21 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Requires:	libxml2

 BuildRequires:	libxml2

+BuildRequires:  zip

 BuildArch:      noarch

 %description

-The DocBook XML DTD-4.5 package contains document type definitions for 

-verification of XML data files against the DocBook rule set. These are 

-useful for structuring books and software documentation to a standard 

+The DocBook XML DTD-4.5 package contains document type definitions for

+verification of XML data files against the DocBook rule set. These are

+useful for structuring books and software documentation to a standard

 allowing you to utilize transformations already written for that standard.

 %prep

 %setup -q

+

 %build

+zip -d tools/lib/jython.jar Lib/distutils/command/wininst-6.exe

+zip -d tools/lib/jython.jar Lib/distutils/command/wininst-7.1.exe

+

 %install

 install -v -m755 -d %{buildroot}/usr/share/xml/docbook/xsl-stylesheets-1.79.1 &&

@@ -41,8 +46,8 @@ install -v -m644    RELEASE-NOTES* NEWS* \

 #There is no source code for make check

 #%check

-#chmod 777 tests -R  

-#make %{?_smp_mflags} check 

+#chmod 777 tests -R

+#make %{?_smp_mflags} check

 %post

 if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&

@@ -82,7 +87,9 @@ fi

 %{_docdir}/*

 %changelog

-*	Thu Aug 18 2017 Rongrong Qiu <rqiu@vmware.com> 1.79.1-5

+*	Tue Dec 04 2018 Ashwin H<ashwinh@vmware.com> 1.79.1-6

+-       Remove windows installers

+*	Fri Aug 18 2017 Rongrong Qiu <rqiu@vmware.com> 1.79.1-5

 -	Update make check for bug 1635477

 *	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-4

 -	Fix arch

@@ -4,7 +4,7 @@

 Summary:        EdgeX Foundry Go Services

 Name:           edgex

 Version:        0.6.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Apache-2.0

 URL:            https://github.com/edgexfoundry/edgex-go

 Group:          Applications/System

@@ -33,7 +33,6 @@ BuildRequires:  make

 BuildRequires:  systemd-devel

 BuildRequires:  zeromq-devel

 Requires:       systemd

-Requires:       mongodb

 Requires:       consul

 %description

@@ -93,5 +92,7 @@ install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/scripts/`basename %{

 %{_var}/log/*

 %changelog

+*   Wed Dec 05 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-2

+-   Remove 'Requires: mongodb'. But edgex still depends on mongo.

 *   Fri Jul 06 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-1

 -   Initial version

@@ -1,14 +1,14 @@

 Summary:        A fast, reliable HA, load balancing, and proxy solution.

 Name:           haproxy

-Version:        1.8.13

-Release:        2%{?dist}

+Version:        1.8.14

+Release:        1%{?dist}

 License:        GPL

 URL:            http://www.haproxy.org

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0:        http://www.haproxy.org/download/1.6/src/%{name}-%{version}.tar.gz

-%define sha1 haproxy=1c8588d63c7592404d0a3ea59aa41c2dccaaa909

+Source0:        http://www.haproxy.org/download/1.8/src/%{name}-%{version}.tar.gz

+%define sha1 haproxy=589c6f933d73e8d6ba5307c8304cafb80e968481

 BuildRequires:  openssl-devel

 BuildRequires:  pcre-devel

 BuildRequires:  lua-devel

@@ -58,6 +58,8 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr

 %{_mandir}/*

 %changelog

+*   Tue Dec 04 2018 Ajay Kaher <akaher@vmware.com> 1.8.14-1

+-   Update to version 1.8.14

 *   Thu Oct 25 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 1.8.13-2

 -   Build with USE_SYSTEMD=1 to fix service startup.

 *   Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.8.13-1

new file mode 100644

@@ -0,0 +1,33 @@

+commit 6da1fb3f64d43be37e640efbec60400d1f1ac39e

+Author: Young_X <YangX92@hotmail.com>

+Date:   Sat Sep 8 14:46:27 2018 +0800

+

+    avoid potential int32 overflows in multiply_ms()

+

+diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c

+index af6e412..c2d5925 100644

+--- a/tools/ppm2tiff.c

+@@ -70,15 +70,16 @@ BadPPM(char* file)

+ 	exit(-2);

+ }

+ 

++

++#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))

++#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)

++

+ static tmsize_t

+ multiply_ms(tmsize_t m1, tmsize_t m2)

+ {

+-	tmsize_t bytes = m1 * m2;

+-

+-	if (m1 && bytes / m1 != m2)

+-		bytes = 0;

+-

+-	return bytes;

++        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )

++            return 0;

++        return m1 * m2;

+ }

+ 

+ int

new file mode 100644

@@ -0,0 +1,64 @@

+commit f1b94e8a3ba49febdd3361c0214a1d1149251577

+Author: Young_X <YangX92@hotmail.com>

+Date:   Sat Sep 8 14:36:12 2018 +0800

+

+    only read/write TIFFTAG_GROUP3OPTIONS or TIFFTAG_GROUP4OPTIONS if compression is COMPRESSION_CCITTFAX3 or COMPRESSION_CCITTFAX4

+

+diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c

+index 01fcf94..01d8502 100644

+--- a/tools/pal2rgb.c

+@@ -402,7 +402,23 @@ cpTags(TIFF* in, TIFF* out)

+ {

+     struct cpTag *p;

+     for (p = tags; p < &tags[NTAGS]; p++)

+-	cpTag(in, out, p->tag, p->count, p->type);

++    {

++        if( p->tag == TIFFTAG_GROUP3OPTIONS )

++        {

++            uint16 compression;

++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||

++                    compression != COMPRESSION_CCITTFAX3 )

++                continue;

++        }

++        if( p->tag == TIFFTAG_GROUP4OPTIONS )

++        {

++            uint16 compression;

++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||

++                    compression != COMPRESSION_CCITTFAX4 )

++                continue;

++        }

++        cpTag(in, out, p->tag, p->count, p->type);

++    }

+ }

+ #undef NTAGS

+ 

+diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c

+index 05faba8..5bef314 100644

+--- a/tools/tiff2bw.c

+@@ -450,7 +450,23 @@ cpTags(TIFF* in, TIFF* out)

+ {

+     struct cpTag *p;

+     for (p = tags; p < &tags[NTAGS]; p++)

+-	cpTag(in, out, p->tag, p->count, p->type);

++    {

++        if( p->tag == TIFFTAG_GROUP3OPTIONS )

++        {

++            uint16 compression;

++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||

++                    compression != COMPRESSION_CCITTFAX3 )

++                continue;

++        }

++        if( p->tag == TIFFTAG_GROUP4OPTIONS )

++        {

++            uint16 compression;

++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||

++                    compression != COMPRESSION_CCITTFAX4 )

++                continue;

++        }

++        cpTag(in, out, p->tag, p->count, p->type);

++    }

+ }

+ #undef NTAGS

+ 

@@ -1,7 +1,7 @@

 Summary:        TIFF libraries and associated utilities.

 Name:           libtiff

 Version:        4.0.9

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        libtiff

 URL:            http://www.simplesystems.org/libtiff/

 Group:          System Environment/Libraries

@@ -17,6 +17,8 @@ Patch4:         libtiff-4.0-9-CVE-2017-11613-1.patch

 Patch5:         libtiff-4.0-9-CVE-2017-11613-2.patch

 Patch6:         libtiff-4.0-9-CVE-2018-7456.patch

 Patch7:         libtiff-4.0.9-CVE-2018-8905.patch

+Patch8:         libtiff-4.0.9-CVE-2018-17100.patch

+Patch9:         libtiff-4.0.9-CVE-2018-17101.patch

 BuildRequires:  libjpeg-turbo-devel

 Requires:       libjpeg-turbo

 %description

@@ -39,6 +41,8 @@ It contains the libraries and header files to create applications

 %patch5 -p1

 %patch6 -p1

 %patch7 -p1

+%patch8 -p1

+%patch9 -p1

 %build

 %configure \

     --disable-static

@@ -72,6 +76,8 @@ make %{?_smp_mflags} -k check

 %{_datadir}/man/man3/*

 %changelog

+*   Sun Dec 02 2018 Ashwin H <xiaolinl@vmware.com> 4.0.9-5

+-   Fix CVE-2018-17100, CVE-2018-17101

 *   Mon May 14 2018 Xiaolin Li <xiaolinl@vmware.com> 4.0.9-4

 -   Fix CVE-2018-7456, CVE-2018-8905, CVE-2018-5784, CVE-2017-11613

 *   Wed Feb 14 2018 Dheeraj Shetty <dheerajs@vmware.com> 4.0.9-3

@@ -3,7 +3,24 @@ From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Sep 2015 15:55:49 -0700

 Subject: [PATCH] pci/probe.c: Hardcodded pci probe.

-Added pci=scan_all cmdline parameter to verify hardcodded pci values

+PCI probing takes a long time to scan resources for all devices

+on PCI bus. Idea of this patch is to hardcode known resources

+for known devices. In VMware hypervisor we do not have much

+virtual PCI devices.

+

+is_known_device() has list of known devices and available

+resources (BARs) for them.

+It returns: 0 if BAR not available for the given device

+            1 if available and sz parameter will have BAR size

+

+guess_bar_count() returns maximum number of BARs for the given

+class to do not probe for all 6 bars

+

+has_rom() returns 0 if given class does not have any ROM BARs,

+which allows to skip ROM probing

+

+Added pci=scan_all cmdline parameter verifies hardcodded pci

+values at runtime.

 ---

  drivers/pci/pci.c   |   2 +

  drivers/pci/pci.h   |   2 +

@@ -456,10 +473,10 @@ diff -ur linux-4.19.1/drivers/pci/probe.c linux-4.19.1_new/drivers/pci/probe.c

 +

 +		if (pci_scan_and_verify)

 +			pci_read_bases(dev, 6, PCI_ROM_ADDRESS);

-+		else if (class != PCI_CLASS_STORAGE_IDE)

++		else

 +			pci_read_bases(dev,

-+			guess_bar_count(dev->class),

-+			has_rom(dev->class, PCI_ROM_ADDRESS));

++				guess_bar_count(dev->class),

++				has_rom(dev->class, PCI_ROM_ADDRESS));

  		pci_subsystem_ids(dev, &dev->subsystem_vendor, &dev->subsystem_device);

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.19.1

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -186,6 +186,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Thu Nov 29 2018 Alexey Makhalov <amakhalov@vmware.com> 4.19.1-3

+-   Fix BAR4 is zero issue for IDE devices

 *   Thu Nov 15 2018 Ajay Kaher <akaher@vmware.com> 4.19.1-2

 -   Adding BuildArch

 *   Thu Nov 08 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.19.1-1

deleted file mode 100644

@@ -1,86 +0,0 @@

-Name:           mongodb

-Version:        3.4.10

-Release:        1%{?dist}

-Summary:        The MongoDB Database

-Group:          Applications/Database

-License:        AGPLv3

-URL:            http://www.mongodb.org/

-Source0:        https://github.com/mongodb/mongo/archive/mongo-r%{version}.tar.gz

-%define sha1    mongo-r=39b1e86c650a7b1b3ccc1dee86d088fc95a0a225

-Vendor:         VMware, Inc.

-Distribution:   Photon

-BuildRequires:  scons

-BuildRequires:  systemd

-

-%description

-MongoDB (from "humongous") is a scalable, high-performance, open source, document-oriented database.

-

-%prep

-%setup -qn mongo-r%{version}

-

-%build

-%ifarch x86_64

-scons %{?_smp_mflags} MONGO_VERSION=%{version} \

-    --disable-warnings-as-errors

-%endif

-

-%ifarch aarch64

-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" \

-    --disable-warnings-as-errors

-%endif

-

-

-

-%install

-%ifarch x86_64

-scons %{?_smp_mflags} MONGO_VERSION=%{version} install \

-    --prefix=%{buildroot}%{_prefix} \

-    --disable-warnings-as-errors

-%endif

-

-%ifarch aarch64

-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" install \

-    --prefix=%{buildroot}%{_prefix} \

-    --disable-warnings-as-errors

-%endif

-

-install -d %{buildroot}/var/log/%{name}

-install -d %{buildroot}/var/lib/mongo

-install -d -m 755 %{buildroot}%{_unitdir}

-install -D -m 644 rpm/mongod.service %{buildroot}%{_unitdir}

-install -D -m 644 rpm/mongod.conf %{buildroot}/etc/mongod.conf

-

-

-%clean

-rm -rf %{buildroot}

-

-# Pre-install

-%pre

-if ! getent group mongod >/dev/null; then

-    /sbin/groupadd -r mongod

-fi

-if ! getent passwd mongod >/dev/null; then

-    /sbin/useradd -g mongod mongod -s /sbin/nologin

-fi

-

-%preun

-    %systemd_preun mongod.service

-

-%postun

-    %systemd_postun_with_restart mongod.service

-

-%post

-    %systemd_post mongod.service

-

-

-%files

-%defattr(-,root,root,-)

-%{_bindir}/*

-%{_unitdir}/mongod.service

-%config(noreplace) %attr(0644, mongod, mongod) %{_sysconfdir}/mongod.conf

-%attr(0766, mongod, mongod) %dir /var/log/%{name}

-%attr(0766, mongod, mongod) %dir /var/lib/mongo

-

-%changelog

-*   Fri Mar 16 2018 Dheeraj Shetty <dheerajs@vmware.com> 3.4.10-1

--   Initial build.  First version

@@ -1,7 +1,7 @@

 Summary:        IPv4 and IPv6 validation methods

 Name:           perl-Data-Validate-IP

 Version:        0.27

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPL+ or Artistic

 Group:          Development/Libraries

 URL:            https://metacpan.org/release/Data-Validate-IP

@@ -12,6 +12,7 @@ Distribution:   Photon

 BuildArch:      noarch

 BuildRequires:  perl

 Requires:       perl

+BuildRequires:  perl-NetAddr-IP

 Requires:       perl-NetAddr-IP

 %description

@@ -33,6 +34,10 @@ make install DESTDIR=%{buildroot}

 find %{buildroot} -name 'perllocal.pod' -delete

 %check

+# Install the required perl module - Test::Requires

+export PERL_MM_USE_DEFAULT=1

+echo "yes" | cpan -a

+cpan -i Test::Requires

 make test

 %files

@@ -40,5 +45,7 @@ make test

 %{_mandir}/man3/*

 %changelog

+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 0.27-2

+-   Fixing the makecheck tests

 *   Thu Sep 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 0.27-1

 -   Initial version.

@@ -2,7 +2,7 @@

 Summary:	Provide the stuff missing in List::Util

 Name:		perl-List-MoreUtils

 Version:	0.428

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPL+ or Artistic

 Group:          Development/Libraries

 URL:		http://search.cpan.org/dist/List-MoreUtils/

@@ -33,6 +33,10 @@ find %{buildroot} -name 'perllocal.pod' -delete

 %{_fixperms} -c %{buildroot}

 %check

+# Install required module List::MoreUtils::XS for maketest

+export PERL_MM_USE_DEFAULT=1

+echo "yes" | cpan -a

+cpan -i List::MoreUtils::XS

 make test

 %files

@@ -42,6 +46,8 @@ make test

 %{_mandir}/man3/List::MoreUtils::Contributing.3.gz

 %changelog

+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 0.428-2

+-   Fix makecheck tests

 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 0.428-1

 -   Update to version 0.428

 *   Wed Apr 05 2017 Robert Qi <qij@vmware.com> 0.418-1

@@ -1,7 +1,7 @@

 Summary:        Perl extension for using OpenSSL

 Name:           perl-Net-SSLeay

 Version:        1.85

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Perl Artistic License 2.0

 Group:          Development/Libraries

 URL:            http://search.cpan.org/~mikem/Net-SSLeay-%{version}/

@@ -47,6 +47,10 @@ find %{buildroot} -type f -name .packlist -delete

 find %{buildroot} -type f -name '*.bs' -empty -delete

 %check

+# Install required modules for test - Test::Pod, Test::Exception, Test::Warn and Test::NoWarnings

+export PERL_MM_USE_DEFAULT=1

+echo "yes" | cpan -a

+cpan -i Test::Pod Test::Exception Test::Warn Test::NoWarnings

 make test

 %files

@@ -54,6 +58,8 @@ make test

 %{_mandir}/man?/*

 %changelog

+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 1.85-3

+-   Fixing makecheck tests

 *   Wed Oct 17 2018 Alexey Makhalov <amakhalov@vmware.com> 1.85-2

 -   Move fips logic to spec file

 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.85-1

@@ -66,4 +72,3 @@ make test

 -   GA - Bump release of all rpms

 *   Mon Mar 28 2016 Mahmoud Bassiouny <mbassiounu@vmware.com> 1.72-1

 -   Initial version.

-

new file mode 100644

@@ -0,0 +1,72 @@

+From 2f6c124e127b5dd98723e7e75a9825c4ed8bd5c7 Mon Sep 17 00:00:00 2001

+From: Paul Howarth <paul@city-fan.org>

+Date: Fri, 23 Feb 2018 13:03:13 +0000

+Subject: [PATCH] Backport of fix for CVE-2018-6594 from pycryptodome

+

+When creating ElGamal keys, the generator wasn't a square residue: ElGamal

+encryption done with those keys cannot be secure under the DDH assumption.

+

+More details:

+- https://github.com/TElgamal/attack-on-pycrypto-elgamal

+- https://github.com/Legrandin/pycryptodome/issues/90

+- https://github.com/dlitz/pycrypto/issues/253

+

+This commit is a backport to pycrypto of Legrandin/pycryptodome@99c27a3b

+Thanks to Weikeng Chen.

+---

+ lib/Crypto/PublicKey/ElGamal.py | 30 +++++++++++++++---------------

+ 1 file changed, 15 insertions(+), 15 deletions(-)

+

+diff --git a/lib/Crypto/PublicKey/ElGamal.py b/lib/Crypto/PublicKey/ElGamal.py

+index 0ab07fc8..064e42bf 100644

+--- a/lib/Crypto/PublicKey/ElGamal.py

+@@ -154,33 +154,33 @@ def generate(bits, randfunc, progress_func=None):

+         if number.isPrime(obj.p, randfunc=randfunc):

+             break

+     # Generate generator g

+-    # See Algorithm 4.80 in Handbook of Applied Cryptography

+-    # Note that the order of the group is n=p-1=2q, where q is prime

+     if progress_func:

+         progress_func('g\n')

+     while 1:

++        # Choose a square residue; it will generate a cyclic group of order q.

++        obj.g = pow(number.getRandomRange(2, obj.p, randfunc), 2, obj.p)

++

+         # We must avoid g=2 because of Bleichenbacher's attack described

+         # in "Generating ElGamal signatures without knowning the secret key",

+         # 1996

+-        #

+-        obj.g = number.getRandomRange(3, obj.p, randfunc)

+-        safe = 1

+-        if pow(obj.g, 2, obj.p)==1:

+-            safe=0

+-        if safe and pow(obj.g, q, obj.p)==1:

+-            safe=0

++        if obj.g in (1, 2):

++            continue

++

+         # Discard g if it divides p-1 because of the attack described

+         # in Note 11.67 (iii) in HAC

+-        if safe and divmod(obj.p-1, obj.g)[1]==0:

+-            safe=0

++        if (obj.p - 1) % obj.g == 0:

++            continue

++

+         # g^{-1} must not divide p-1 because of Khadir's attack

+         # described in "Conditions of the generator for forging ElGamal

+         # signature", 2011

+         ginv = number.inverse(obj.g, obj.p)

+-        if safe and divmod(obj.p-1, ginv)[1]==0:

+-            safe=0

+-        if safe:

+-            break

++        if (obj.p - 1) % ginv == 0:

++            continue

++

++        # Found

++        break

++

+     # Generate private key x

+     if progress_func:

+         progress_func('x\n')

@@ -4,12 +4,13 @@

 Summary:        The Python Cryptography Toolkit.

 Name:           pycrypto

 Version:        2.6.1

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        Public Domain and Python

 URL:            http://www.pycrypto.org/

 Source0:        https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/%{name}-%{version}.tar.gz

 %define         sha1 pycrypto=aeda3ed41caf1766409d4efc689b9ca30ad6aeb2

 Patch0:         pycrypto-2.6.1-CVE-2013-7459.patch

+Patch1:		pycrypto-2.6.1-CVE-2018-6594.patch

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -18,7 +19,7 @@ BuildRequires:  python-setuptools

 BuildRequires:  python2-devel

 Requires:       python2

 %description

-This is a collection of both secure hash functions (such as SHA256 and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). 

+This is a collection of both secure hash functions (such as SHA256 and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.).

 %package -n     python3-pycrypto

 Summary:        python3-pycrypto

@@ -33,6 +34,7 @@ Python 3 version.

 %prep

 %setup -q

 %patch0 -p1

+%patch1 -p1

 %build

 python2 setup.py build

@@ -55,6 +57,8 @@ python3 setup.py test

 %{python3_sitelib}/*

 %changelog

+*   Thu Nov 29 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.6.1-4

+-   Apply patch for CVE-2018-6594

 *   Thu Jul 20 2017 Anish Swaminathan <anishs@vmware.com> 2.6.1-3

 -   Apply patch for CVE-2013-7459

 *   Thu Jul 13 2017 Divya Thaluru <dthaluru@vmware.com> 2.6.1-2

@@ -3,7 +3,7 @@

 Name:           python-ConcurrentLogHandler

 Version:        0.9.1

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        Concurrent logging handler (drop-in replacement for RotatingFileHandler) Python 2.6+

 License:        Apache-2.0

 Group:          Development/Languages/Python

@@ -58,7 +58,15 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 popd

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

-#No test case available for this package

+%check

+PATH=%{buildroot}%{_bindir}:${PATH} \

+PYTHONPATH=%{buildroot}%{python_sitelib} \

+python2 stresstest.py

+pushd ../p3dir

+PATH=%{buildroot}%{_bindir}:${PATH} \

+PYTHONPATH=%{buildroot}%{python3_sitelib} \

+python3 stresstest.py

+popd

 %files

 %defattr(-,root,root,-)

@@ -73,6 +81,8 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %exclude /usr/tests/stresstest.py

 %changelog

+*   Mon Dec 03 2018 Ashwin H <ashwinh@vmware.com> 0.9.1-3

+-   Add %check

 *   Thu Sep 21 2017 Bo Gan <ganb@vmware.com> 0.9.1-2

 -   Disable test as no tests are available

 *   Fri Aug 25 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.1-1

new file mode 100644

@@ -0,0 +1,75 @@

+commit 7f3dd65e5dc79cc456ef58a052501ec256d5070b

+Author: Giuseppe Lavagetto <lavagetto@gmail.com>

+Date:   Mon Feb 13 14:12:39 2017 +0100

+

+    Support auth API both <= 2.2.5 and >= 2.3.0

+    

+    Closes #210

+

+diff --git a/src/etcd/auth.py b/src/etcd/auth.py

+index 796772d..c5c7346 100644

+--- a/src/etcd/auth.py

+@@ -14,13 +14,28 @@ class EtcdAuthBase(object):

+         self.name = name

+         self.uri = "{}/auth/{}s/{}".format(self.client.version_prefix,

+                                            self.entity, self.name)

++        # This will be lazily evaluated if not manually set

++        self._legacy_api = None

++

++    @property

++    def legacy_api(self):

++        if self._legacy_api is None:

++            # The auth API has changed between 2.2 and 2.3, true story!

++            major, minor, _ = map(int, self.client.version.split('.'))

++            self._legacy_api = (major < 3 and minor < 3)

++        return self._legacy_api

++

+ 

+     @property

+     def names(self):

+         key = "{}s".format(self.entity)

+         uri = "{}/auth/{}".format(self.client.version_prefix, key)

+         response = self.client.api_execute(uri, self.client._MGET)

+-        return json.loads(response.data.decode('utf-8'))[key]

++        if self.legacy_api:

++            return json.loads(response.data.decode('utf-8'))[key]

++        else:

++            return [obj[self.entity]

++                    for obj in json.loads(response.data.decode('utf-8'))[key]]

+ 

+     def read(self):

+         try:

+@@ -102,7 +117,16 @@ class EtcdUser(EtcdAuthBase):

+ 

+     def _from_net(self, data):

+         d = json.loads(data.decode('utf-8'))

+-        self.roles = d.get('roles', [])

++        roles = d.get('roles', [])

++        try:

++            self.roles = roles

++        except TypeError:

++            # with the change of API, PUT responses are different

++            # from GET reponses, which makes everything so funny.

++            # Specifically, PUT responses are the same as before...

++            if self.legacy_api:

++                raise

++            self.roles = [obj['role'] for obj in roles]

+         self.name = d.get('user')

+ 

+     def _to_net(self, prevobj=None):

+diff --git a/src/etcd/tests/test_auth.py b/src/etcd/tests/test_auth.py

+index 14475f9..5c8c0b0 100644

+--- a/src/etcd/tests/test_auth.py

+@@ -93,6 +93,10 @@ class EtcdUserTest(TestEtcdAuthBase):

+         self.assertEquals(u.roles, set(['guest', 'root']))

+         # set roles as a list, it works!

+         u.roles = ['guest', 'test_group']

++        # We need this or the new API will return an internal error

++        r = auth.EtcdRole(self.client, 'test_group')

++        r.acls = {'*': 'R', '/test/*': 'RW'}

++        r.write()

+         try:

+             u.write()

+         except:

@@ -3,12 +3,13 @@

 Name:           python-etcd

 Version:        0.4.5

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Python API for etcd

 License:        MIT

 Group:          Development/Languages/Python

 Url:            https://pypi.python.org/pypi/python-etcd

 Source0:        %{name}-%{version}.tar.gz

+Patch0:         auth-api-compatibility.patch

 %define sha1    python-etcd=9e79ae82429cf2ffbe2b5647e14bc29571afd766

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -18,6 +19,15 @@ BuildRequires:  python2-devel

 BuildRequires:  python2-libs

 BuildRequires:  python-pip

 BuildRequires:  python-setuptools

+%if %{with_check}

+BuildRequires:  python-dnspython

+BuildRequires:  python-urllib3

+BuildRequires:  python-pyOpenSSL

+BuildRequires:  etcd

+BuildRequires:  openssl-devel

+BuildRequires:  curl-devel

+BuildRequires:  libffi-devel

+%endif

 Requires:       python2

 Requires:       python2-libs

 Requires:       python-setuptools

@@ -33,12 +43,18 @@ BuildRequires:  python3-devel

 BuildRequires:  python3-libs

 BuildRequires:  python3-pip

 BuildRequires:  python3-setuptools

+%if %{with_check}

+BuildRequires:  python3-dnspython

+BuildRequires:  python3-urllib3

+BuildRequires:  python3-pyOpenSSL

+%endif

 %description -n python3-etcd

 Python3 API for etcd

 %prep

 %setup -n %{name}-%{version}

+%patch0 -p1

 rm -rf ../p3dir

 cp -a . ../p3dir

@@ -54,6 +70,14 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 popd

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+%check

+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)

+$easy_install_2 nose

+python2 setup.py test

+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)

+$easy_install_3 nose