Browse code

Merge branch 'master' of https://github.com/vmware/photon

archive authored on 2018/12/07 23:30:14
Showing 130 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 
3 3
 Name:           cloud-init
4 4
 Version:        18.3
5
-Release:        1%{?dist}
5
+Release:        2%{?dist}
6 6
 Summary:        Cloud instance init scripts
7 7
 Group:          System Environment/Base
8 8
 License:        GPLv3
... ...
@@ -22,6 +22,7 @@ Patch6:         systemd-service-changes.patch
22 22
 Patch7:         makecheck.patch
23 23
 Patch8:         systemd-resolved-config.patch
24 24
 Patch9:         cloud-init-azureds.patch
25
+Patch10:        ds-identity.patch
25 26
 
26 27
 BuildRequires:  python3
27 28
 BuildRequires:  python3-libs
... ...
@@ -77,6 +78,7 @@ ssh keys and to let the user run various scripts.
77 77
 %patch7 -p1
78 78
 %patch8 -p1
79 79
 %patch9 -p1
80
+%patch10 -p1
80 81
 
81 82
 find systemd -name "cloud*.service*" | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g
82 83
 
... ...
@@ -145,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
145 145
 
146 146
 
147 147
 %changelog
148
+*   Tue Dec 04 2018 Ajay Kaher <akaher@vmware.com> 18.3-2
149
+-   Fix auto startup at boot time
148 150
 *   Wed Oct 24 2018 Ajay Kaher <akaher@vmware.com> 18.3-1
149 151
 -   Upgraded version to 18.3
150 152
 *   Sun Oct 07 2018 Tapas Kundu <tkundu@vmware.com> 0.7.9-15
151 153
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+diff -rupN cloud-init-18.3/tools/ds-identify cloud-init-18.3_ds-identity-fixed/tools/ds-identify
1
+--- cloud-init-18.3/tools/ds-identify	2018-06-20 00:19:26.000000000 +0000
2
+@@ -85,7 +85,7 @@ _DI_LOGGED=""
3
+ DI_MAIN=${DI_MAIN:-main}
4
+ 
5
+ DI_BLKID_OUTPUT=""
6
+-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
7
++DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_ENABLED}"
8
+ DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
9
+ DI_DMI_CHASSIS_ASSET_TAG=""
10
+ DI_DMI_PRODUCT_NAME=""
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Docbook-xsl-1.79.1
2 2
 Name:		docbook-xsl
3 3
 Version:	1.79.1
4
-Release:	5%{?dist}
4
+Release:	6%{?dist}
5 5
 License:	Apache License
6 6
 URL:		http://www.docbook.org
7 7
 Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2
... ...
@@ -11,16 +11,21 @@ Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 Requires:	libxml2
13 13
 BuildRequires:	libxml2
14
+BuildRequires:  zip
14 15
 BuildArch:      noarch
15 16
 
16 17
 %description
17
-The DocBook XML DTD-4.5 package contains document type definitions for 
18
-verification of XML data files against the DocBook rule set. These are 
19
-useful for structuring books and software documentation to a standard 
18
+The DocBook XML DTD-4.5 package contains document type definitions for
19
+verification of XML data files against the DocBook rule set. These are
20
+useful for structuring books and software documentation to a standard
20 21
 allowing you to utilize transformations already written for that standard.
21 22
 %prep
22 23
 %setup -q
24
+
23 25
 %build
26
+zip -d tools/lib/jython.jar Lib/distutils/command/wininst-6.exe
27
+zip -d tools/lib/jython.jar Lib/distutils/command/wininst-7.1.exe
28
+
24 29
 %install
25 30
 install -v -m755 -d %{buildroot}/usr/share/xml/docbook/xsl-stylesheets-1.79.1 &&
26 31
 
... ...
@@ -41,8 +46,8 @@ install -v -m644    RELEASE-NOTES* NEWS* \
41 41
 
42 42
 #There is no source code for make check
43 43
 #%check
44
-#chmod 777 tests -R  
45
-#make %{?_smp_mflags} check 
44
+#chmod 777 tests -R
45
+#make %{?_smp_mflags} check
46 46
 
47 47
 %post
48 48
 if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
... ...
@@ -82,7 +87,9 @@ fi
82 82
 %{_docdir}/*
83 83
 
84 84
 %changelog
85
-*	Thu Aug 18 2017 Rongrong Qiu <rqiu@vmware.com> 1.79.1-5
85
+*	Tue Dec 04 2018 Ashwin H<ashwinh@vmware.com> 1.79.1-6
86
+-       Remove windows installers
87
+*	Fri Aug 18 2017 Rongrong Qiu <rqiu@vmware.com> 1.79.1-5
86 88
 -	Update make check for bug 1635477
87 89
 *	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-4
88 90
 -	Fix arch
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        EdgeX Foundry Go Services
5 5
 Name:           edgex
6 6
 Version:        0.6.0
7
-Release:        1%{?dist}
7
+Release:        2%{?dist}
8 8
 License:        Apache-2.0
9 9
 URL:            https://github.com/edgexfoundry/edgex-go
10 10
 Group:          Applications/System
... ...
@@ -33,7 +33,6 @@ BuildRequires:  make
33 33
 BuildRequires:  systemd-devel
34 34
 BuildRequires:  zeromq-devel
35 35
 Requires:       systemd
36
-Requires:       mongodb
37 36
 Requires:       consul
38 37
 
39 38
 %description
... ...
@@ -93,5 +92,7 @@ install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/scripts/`basename %{
93 93
 %{_var}/log/*
94 94
 
95 95
 %changelog
96
+*   Wed Dec 05 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-2
97
+-   Remove 'Requires: mongodb'. But edgex still depends on mongo.
96 98
 *   Fri Jul 06 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-1
97 99
 -   Initial version
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:        A fast, reliable HA, load balancing, and proxy solution.
2 2
 Name:           haproxy
3
-Version:        1.8.13
4
-Release:        2%{?dist}
3
+Version:        1.8.14
4
+Release:        1%{?dist}
5 5
 License:        GPL
6 6
 URL:            http://www.haproxy.org
7 7
 Group:          Applications/System
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
-Source0:        http://www.haproxy.org/download/1.6/src/%{name}-%{version}.tar.gz
11
-%define sha1 haproxy=1c8588d63c7592404d0a3ea59aa41c2dccaaa909
10
+Source0:        http://www.haproxy.org/download/1.8/src/%{name}-%{version}.tar.gz
11
+%define sha1 haproxy=589c6f933d73e8d6ba5307c8304cafb80e968481
12 12
 BuildRequires:  openssl-devel
13 13
 BuildRequires:  pcre-devel
14 14
 BuildRequires:  lua-devel
... ...
@@ -58,6 +58,8 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr
58 58
 %{_mandir}/*
59 59
 
60 60
 %changelog
61
+*   Tue Dec 04 2018 Ajay Kaher <akaher@vmware.com> 1.8.14-1
62
+-   Update to version 1.8.14
61 63
 *   Thu Oct 25 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 1.8.13-2
62 64
 -   Build with USE_SYSTEMD=1 to fix service startup.
63 65
 *   Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.8.13-1
64 66
new file mode 100644
... ...
@@ -0,0 +1,33 @@
0
+commit 6da1fb3f64d43be37e640efbec60400d1f1ac39e
1
+Author: Young_X <YangX92@hotmail.com>
2
+Date:   Sat Sep 8 14:46:27 2018 +0800
3
+
4
+    avoid potential int32 overflows in multiply_ms()
5
+
6
+diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c
7
+index af6e412..c2d5925 100644
8
+--- a/tools/ppm2tiff.c
9
+@@ -70,15 +70,16 @@ BadPPM(char* file)
10
+ 	exit(-2);
11
+ }
12
+ 
13
++
14
++#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
15
++#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
16
++
17
+ static tmsize_t
18
+ multiply_ms(tmsize_t m1, tmsize_t m2)
19
+ {
20
+-	tmsize_t bytes = m1 * m2;
21
+-
22
+-	if (m1 && bytes / m1 != m2)
23
+-		bytes = 0;
24
+-
25
+-	return bytes;
26
++        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
27
++            return 0;
28
++        return m1 * m2;
29
+ }
30
+ 
31
+ int
0 32
new file mode 100644
... ...
@@ -0,0 +1,64 @@
0
+commit f1b94e8a3ba49febdd3361c0214a1d1149251577
1
+Author: Young_X <YangX92@hotmail.com>
2
+Date:   Sat Sep 8 14:36:12 2018 +0800
3
+
4
+    only read/write TIFFTAG_GROUP3OPTIONS or TIFFTAG_GROUP4OPTIONS if compression is COMPRESSION_CCITTFAX3 or COMPRESSION_CCITTFAX4
5
+
6
+diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
7
+index 01fcf94..01d8502 100644
8
+--- a/tools/pal2rgb.c
9
+@@ -402,7 +402,23 @@ cpTags(TIFF* in, TIFF* out)
10
+ {
11
+     struct cpTag *p;
12
+     for (p = tags; p < &tags[NTAGS]; p++)
13
+-	cpTag(in, out, p->tag, p->count, p->type);
14
++    {
15
++        if( p->tag == TIFFTAG_GROUP3OPTIONS )
16
++        {
17
++            uint16 compression;
18
++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
19
++                    compression != COMPRESSION_CCITTFAX3 )
20
++                continue;
21
++        }
22
++        if( p->tag == TIFFTAG_GROUP4OPTIONS )
23
++        {
24
++            uint16 compression;
25
++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
26
++                    compression != COMPRESSION_CCITTFAX4 )
27
++                continue;
28
++        }
29
++        cpTag(in, out, p->tag, p->count, p->type);
30
++    }
31
+ }
32
+ #undef NTAGS
33
+ 
34
+diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c
35
+index 05faba8..5bef314 100644
36
+--- a/tools/tiff2bw.c
37
+@@ -450,7 +450,23 @@ cpTags(TIFF* in, TIFF* out)
38
+ {
39
+     struct cpTag *p;
40
+     for (p = tags; p < &tags[NTAGS]; p++)
41
+-	cpTag(in, out, p->tag, p->count, p->type);
42
++    {
43
++        if( p->tag == TIFFTAG_GROUP3OPTIONS )
44
++        {
45
++            uint16 compression;
46
++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
47
++                    compression != COMPRESSION_CCITTFAX3 )
48
++                continue;
49
++        }
50
++        if( p->tag == TIFFTAG_GROUP4OPTIONS )
51
++        {
52
++            uint16 compression;
53
++            if( !TIFFGetField(in, TIFFTAG_COMPRESSION, &compression) ||
54
++                    compression != COMPRESSION_CCITTFAX4 )
55
++                continue;
56
++        }
57
++        cpTag(in, out, p->tag, p->count, p->type);
58
++    }
59
+ }
60
+ #undef NTAGS
61
+ 
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        TIFF libraries and associated utilities.
2 2
 Name:           libtiff
3 3
 Version:        4.0.9
4
-Release:        4%{?dist}
4
+Release:        5%{?dist}
5 5
 License:        libtiff
6 6
 URL:            http://www.simplesystems.org/libtiff/
7 7
 Group:          System Environment/Libraries
... ...
@@ -17,6 +17,8 @@ Patch4:         libtiff-4.0-9-CVE-2017-11613-1.patch
17 17
 Patch5:         libtiff-4.0-9-CVE-2017-11613-2.patch
18 18
 Patch6:         libtiff-4.0-9-CVE-2018-7456.patch
19 19
 Patch7:         libtiff-4.0.9-CVE-2018-8905.patch
20
+Patch8:         libtiff-4.0.9-CVE-2018-17100.patch
21
+Patch9:         libtiff-4.0.9-CVE-2018-17101.patch
20 22
 BuildRequires:  libjpeg-turbo-devel
21 23
 Requires:       libjpeg-turbo
22 24
 %description
... ...
@@ -39,6 +41,8 @@ It contains the libraries and header files to create applications
39 39
 %patch5 -p1
40 40
 %patch6 -p1
41 41
 %patch7 -p1
42
+%patch8 -p1
43
+%patch9 -p1
42 44
 %build
43 45
 %configure \
44 46
     --disable-static
... ...
@@ -72,6 +76,8 @@ make %{?_smp_mflags} -k check
72 72
 %{_datadir}/man/man3/*
73 73
 
74 74
 %changelog
75
+*   Sun Dec 02 2018 Ashwin H <xiaolinl@vmware.com> 4.0.9-5
76
+-   Fix CVE-2018-17100, CVE-2018-17101
75 77
 *   Mon May 14 2018 Xiaolin Li <xiaolinl@vmware.com> 4.0.9-4
76 78
 -   Fix CVE-2018-7456, CVE-2018-8905, CVE-2018-5784, CVE-2017-11613
77 79
 *   Wed Feb 14 2018 Dheeraj Shetty <dheerajs@vmware.com> 4.0.9-3
... ...
@@ -3,7 +3,24 @@ From: Alexey Makhalov <amakhalov@vmware.com>
3 3
 Date: Tue, 29 Sep 2015 15:55:49 -0700
4 4
 Subject: [PATCH] pci/probe.c: Hardcodded pci probe.
5 5
 
6
-Added pci=scan_all cmdline parameter to verify hardcodded pci values
6
+PCI probing takes a long time to scan resources for all devices
7
+on PCI bus. Idea of this patch is to hardcode known resources
8
+for known devices. In VMware hypervisor we do not have much
9
+virtual PCI devices.
10
+
11
+is_known_device() has list of known devices and available
12
+resources (BARs) for them.
13
+It returns: 0 if BAR not available for the given device
14
+            1 if available and sz parameter will have BAR size
15
+
16
+guess_bar_count() returns maximum number of BARs for the given
17
+class to do not probe for all 6 bars
18
+
19
+has_rom() returns 0 if given class does not have any ROM BARs,
20
+which allows to skip ROM probing
21
+
22
+Added pci=scan_all cmdline parameter verifies hardcodded pci
23
+values at runtime.
7 24
 ---
8 25
  drivers/pci/pci.c   |   2 +
9 26
  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
456 456
 +
457 457
 +		if (pci_scan_and_verify)
458 458
 +			pci_read_bases(dev, 6, PCI_ROM_ADDRESS);
459
-+		else if (class != PCI_CLASS_STORAGE_IDE)
459
++		else
460 460
 +			pci_read_bases(dev,
461
-+			guess_bar_count(dev->class),
462
-+			has_rom(dev->class, PCI_ROM_ADDRESS));
461
++				guess_bar_count(dev->class),
462
++				has_rom(dev->class, PCI_ROM_ADDRESS));
463 463
  
464 464
  		pci_subsystem_ids(dev, &dev->subsystem_vendor, &dev->subsystem_device);
465 465
  
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux-esx
4 4
 Version:        4.19.1
5
-Release:        2%{?dist}
5
+Release:        3%{?dist}
6 6
 License:        GPLv2
7 7
 URL:            http://www.kernel.org/
8 8
 Group:          System Environment/Kernel
... ...
@@ -186,6 +186,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
186 186
 /usr/src/linux-headers-%{uname_r}
187 187
 
188 188
 %changelog
189
+*   Thu Nov 29 2018 Alexey Makhalov <amakhalov@vmware.com> 4.19.1-3
190
+-   Fix BAR4 is zero issue for IDE devices
189 191
 *   Thu Nov 15 2018 Ajay Kaher <akaher@vmware.com> 4.19.1-2
190 192
 -   Adding BuildArch
191 193
 *   Thu Nov 08 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.19.1-1
192 194
deleted file mode 100644
... ...
@@ -1,86 +0,0 @@
1
-Name:           mongodb
2
-Version:        3.4.10
3
-Release:        1%{?dist}
4
-Summary:        The MongoDB Database
5
-Group:          Applications/Database
6
-License:        AGPLv3
7
-URL:            http://www.mongodb.org/
8
-Source0:        https://github.com/mongodb/mongo/archive/mongo-r%{version}.tar.gz
9
-%define sha1    mongo-r=39b1e86c650a7b1b3ccc1dee86d088fc95a0a225
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-BuildRequires:  scons
13
-BuildRequires:  systemd
14
-
15
-%description
16
-MongoDB (from "humongous") is a scalable, high-performance, open source, document-oriented database.
17
-
18
-%prep
19
-%setup -qn mongo-r%{version}
20
-
21
-%build
22
-%ifarch x86_64
23
-scons %{?_smp_mflags} MONGO_VERSION=%{version} \
24
-    --disable-warnings-as-errors
25
-%endif
26
-
27
-%ifarch aarch64
28
-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" \
29
-    --disable-warnings-as-errors
30
-%endif
31
-
32
-
33
-
34
-%install
35
-%ifarch x86_64
36
-scons %{?_smp_mflags} MONGO_VERSION=%{version} install \
37
-    --prefix=%{buildroot}%{_prefix} \
38
-    --disable-warnings-as-errors
39
-%endif
40
-
41
-%ifarch aarch64
42
-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" install \
43
-    --prefix=%{buildroot}%{_prefix} \
44
-    --disable-warnings-as-errors
45
-%endif
46
-
47
-install -d %{buildroot}/var/log/%{name}
48
-install -d %{buildroot}/var/lib/mongo
49
-install -d -m 755 %{buildroot}%{_unitdir}
50
-install -D -m 644 rpm/mongod.service %{buildroot}%{_unitdir}
51
-install -D -m 644 rpm/mongod.conf %{buildroot}/etc/mongod.conf
52
-
53
-
54
-%clean
55
-rm -rf %{buildroot}
56
-
57
-# Pre-install
58
-%pre
59
-if ! getent group mongod >/dev/null; then
60
-    /sbin/groupadd -r mongod
61
-fi
62
-if ! getent passwd mongod >/dev/null; then
63
-    /sbin/useradd -g mongod mongod -s /sbin/nologin
64
-fi
65
-
66
-%preun
67
-    %systemd_preun mongod.service
68
-
69
-%postun
70
-    %systemd_postun_with_restart mongod.service
71
-
72
-%post
73
-    %systemd_post mongod.service
74
-
75
-
76
-%files
77
-%defattr(-,root,root,-)
78
-%{_bindir}/*
79
-%{_unitdir}/mongod.service
80
-%config(noreplace) %attr(0644, mongod, mongod) %{_sysconfdir}/mongod.conf
81
-%attr(0766, mongod, mongod) %dir /var/log/%{name}
82
-%attr(0766, mongod, mongod) %dir /var/lib/mongo
83
-
84
-%changelog
85
-*   Fri Mar 16 2018 Dheeraj Shetty <dheerajs@vmware.com> 3.4.10-1
86
--   Initial build.  First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        IPv4 and IPv6 validation methods
2 2
 Name:           perl-Data-Validate-IP
3 3
 Version:        0.27
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        GPL+ or Artistic
6 6
 Group:          Development/Libraries
7 7
 URL:            https://metacpan.org/release/Data-Validate-IP
... ...
@@ -12,6 +12,7 @@ Distribution:   Photon
12 12
 BuildArch:      noarch
13 13
 BuildRequires:  perl
14 14
 Requires:       perl
15
+BuildRequires:  perl-NetAddr-IP
15 16
 Requires:       perl-NetAddr-IP
16 17
 
17 18
 %description
... ...
@@ -33,6 +34,10 @@ make install DESTDIR=%{buildroot}
33 33
 find %{buildroot} -name 'perllocal.pod' -delete
34 34
 
35 35
 %check
36
+# Install the required perl module - Test::Requires
37
+export PERL_MM_USE_DEFAULT=1
38
+echo "yes" | cpan -a
39
+cpan -i Test::Requires
36 40
 make test
37 41
 
38 42
 %files
... ...
@@ -40,5 +45,7 @@ make test
40 40
 %{_mandir}/man3/*
41 41
 
42 42
 %changelog
43
+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 0.27-2
44
+-   Fixing the makecheck tests
43 45
 *   Thu Sep 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 0.27-1
44 46
 -   Initial version.
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:	Provide the stuff missing in List::Util
3 3
 Name:		perl-List-MoreUtils
4 4
 Version:	0.428
5
-Release:	1%{?dist}
5
+Release:	2%{?dist}
6 6
 License:	GPL+ or Artistic
7 7
 Group:          Development/Libraries
8 8
 URL:		http://search.cpan.org/dist/List-MoreUtils/
... ...
@@ -33,6 +33,10 @@ find %{buildroot} -name 'perllocal.pod' -delete
33 33
 %{_fixperms} -c %{buildroot}
34 34
 
35 35
 %check
36
+# Install required module List::MoreUtils::XS for maketest
37
+export PERL_MM_USE_DEFAULT=1
38
+echo "yes" | cpan -a
39
+cpan -i List::MoreUtils::XS
36 40
 make test
37 41
 
38 42
 %files
... ...
@@ -42,6 +46,8 @@ make test
42 42
 %{_mandir}/man3/List::MoreUtils::Contributing.3.gz
43 43
 
44 44
 %changelog
45
+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 0.428-2
46
+-   Fix makecheck tests
45 47
 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 0.428-1
46 48
 -   Update to version 0.428
47 49
 *   Wed Apr 05 2017 Robert Qi <qij@vmware.com> 0.418-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Perl extension for using OpenSSL
2 2
 Name:           perl-Net-SSLeay
3 3
 Version:        1.85
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        Perl Artistic License 2.0
6 6
 Group:          Development/Libraries
7 7
 URL:            http://search.cpan.org/~mikem/Net-SSLeay-%{version}/
... ...
@@ -47,6 +47,10 @@ find %{buildroot} -type f -name .packlist -delete
47 47
 find %{buildroot} -type f -name '*.bs' -empty -delete
48 48
 
49 49
 %check
50
+# Install required modules for test - Test::Pod, Test::Exception, Test::Warn and Test::NoWarnings
51
+export PERL_MM_USE_DEFAULT=1
52
+echo "yes" | cpan -a
53
+cpan -i Test::Pod Test::Exception Test::Warn Test::NoWarnings
50 54
 make test
51 55
 
52 56
 %files
... ...
@@ -54,6 +58,8 @@ make test
54 54
 %{_mandir}/man?/*
55 55
 
56 56
 %changelog
57
+*   Mon Dec 03 2018 Dweep Advani <dadvani@vmware.com> 1.85-3
58
+-   Fixing makecheck tests
57 59
 *   Wed Oct 17 2018 Alexey Makhalov <amakhalov@vmware.com> 1.85-2
58 60
 -   Move fips logic to spec file
59 61
 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.85-1
... ...
@@ -66,4 +72,3 @@ make test
66 66
 -   GA - Bump release of all rpms
67 67
 *   Mon Mar 28 2016 Mahmoud Bassiouny <mbassiounu@vmware.com> 1.72-1
68 68
 -   Initial version.
69
-
70 69
new file mode 100644
... ...
@@ -0,0 +1,72 @@
0
+From 2f6c124e127b5dd98723e7e75a9825c4ed8bd5c7 Mon Sep 17 00:00:00 2001
1
+From: Paul Howarth <paul@city-fan.org>
2
+Date: Fri, 23 Feb 2018 13:03:13 +0000
3
+Subject: [PATCH] Backport of fix for CVE-2018-6594 from pycryptodome
4
+
5
+When creating ElGamal keys, the generator wasn't a square residue: ElGamal
6
+encryption done with those keys cannot be secure under the DDH assumption.
7
+
8
+More details:
9
+- https://github.com/TElgamal/attack-on-pycrypto-elgamal
10
+- https://github.com/Legrandin/pycryptodome/issues/90
11
+- https://github.com/dlitz/pycrypto/issues/253
12
+
13
+This commit is a backport to pycrypto of Legrandin/pycryptodome@99c27a3b
14
+Thanks to Weikeng Chen.
15
+---
16
+ lib/Crypto/PublicKey/ElGamal.py | 30 +++++++++++++++---------------
17
+ 1 file changed, 15 insertions(+), 15 deletions(-)
18
+
19
+diff --git a/lib/Crypto/PublicKey/ElGamal.py b/lib/Crypto/PublicKey/ElGamal.py
20
+index 0ab07fc8..064e42bf 100644
21
+--- a/lib/Crypto/PublicKey/ElGamal.py
22
+@@ -154,33 +154,33 @@ def generate(bits, randfunc, progress_func=None):
23
+         if number.isPrime(obj.p, randfunc=randfunc):
24
+             break
25
+     # Generate generator g
26
+-    # See Algorithm 4.80 in Handbook of Applied Cryptography
27
+-    # Note that the order of the group is n=p-1=2q, where q is prime
28
+     if progress_func:
29
+         progress_func('g\n')
30
+     while 1:
31
++        # Choose a square residue; it will generate a cyclic group of order q.
32
++        obj.g = pow(number.getRandomRange(2, obj.p, randfunc), 2, obj.p)
33
++
34
+         # We must avoid g=2 because of Bleichenbacher's attack described
35
+         # in "Generating ElGamal signatures without knowning the secret key",
36
+         # 1996
37
+-        #
38
+-        obj.g = number.getRandomRange(3, obj.p, randfunc)
39
+-        safe = 1
40
+-        if pow(obj.g, 2, obj.p)==1:
41
+-            safe=0
42
+-        if safe and pow(obj.g, q, obj.p)==1:
43
+-            safe=0
44
++        if obj.g in (1, 2):
45
++            continue
46
++
47
+         # Discard g if it divides p-1 because of the attack described
48
+         # in Note 11.67 (iii) in HAC
49
+-        if safe and divmod(obj.p-1, obj.g)[1]==0:
50
+-            safe=0
51
++        if (obj.p - 1) % obj.g == 0:
52
++            continue
53
++
54
+         # g^{-1} must not divide p-1 because of Khadir's attack
55
+         # described in "Conditions of the generator for forging ElGamal
56
+         # signature", 2011
57
+         ginv = number.inverse(obj.g, obj.p)
58
+-        if safe and divmod(obj.p-1, ginv)[1]==0:
59
+-            safe=0
60
+-        if safe:
61
+-            break
62
++        if (obj.p - 1) % ginv == 0:
63
++            continue
64
++
65
++        # Found
66
++        break
67
++
68
+     # Generate private key x
69
+     if progress_func:
70
+         progress_func('x\n')
... ...
@@ -4,12 +4,13 @@
4 4
 Summary:        The Python Cryptography Toolkit.
5 5
 Name:           pycrypto
6 6
 Version:        2.6.1
7
-Release:        3%{?dist}
7
+Release:        4%{?dist}
8 8
 License:        Public Domain and Python
9 9
 URL:            http://www.pycrypto.org/
10 10
 Source0:        https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/%{name}-%{version}.tar.gz
11 11
 %define         sha1 pycrypto=aeda3ed41caf1766409d4efc689b9ca30ad6aeb2
12 12
 Patch0:         pycrypto-2.6.1-CVE-2013-7459.patch
13
+Patch1:		pycrypto-2.6.1-CVE-2018-6594.patch
13 14
 Group:          Development/Tools
14 15
 Vendor:         VMware, Inc.
15 16
 Distribution:   Photon
... ...
@@ -18,7 +19,7 @@ BuildRequires:  python-setuptools
18 18
 BuildRequires:  python2-devel
19 19
 Requires:       python2
20 20
 %description
21
-This is a collection of both secure hash functions (such as SHA256 and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). 
21
+This is a collection of both secure hash functions (such as SHA256 and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.).
22 22
 
23 23
 %package -n     python3-pycrypto
24 24
 Summary:        python3-pycrypto
... ...
@@ -33,6 +34,7 @@ Python 3 version.
33 33
 %prep
34 34
 %setup -q
35 35
 %patch0 -p1
36
+%patch1 -p1
36 37
 
37 38
 %build
38 39
 python2 setup.py build
... ...
@@ -55,6 +57,8 @@ python3 setup.py test
55 55
 %{python3_sitelib}/*
56 56
 
57 57
 %changelog
58
+*   Thu Nov 29 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.6.1-4
59
+-   Apply patch for CVE-2018-6594
58 60
 *   Thu Jul 20 2017 Anish Swaminathan <anishs@vmware.com> 2.6.1-3
59 61
 -   Apply patch for CVE-2013-7459
60 62
 *   Thu Jul 13 2017 Divya Thaluru <dthaluru@vmware.com> 2.6.1-2
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 Name:           python-ConcurrentLogHandler
5 5
 Version:        0.9.1
6
-Release:        2%{?dist}
6
+Release:        3%{?dist}
7 7
 Summary:        Concurrent logging handler (drop-in replacement for RotatingFileHandler) Python 2.6+
8 8
 License:        Apache-2.0
9 9
 Group:          Development/Languages/Python
... ...
@@ -58,7 +58,15 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
58 58
 popd
59 59
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
60 60
 
61
-#No test case available for this package
61
+%check
62
+PATH=%{buildroot}%{_bindir}:${PATH} \
63
+PYTHONPATH=%{buildroot}%{python_sitelib} \
64
+python2 stresstest.py
65
+pushd ../p3dir
66
+PATH=%{buildroot}%{_bindir}:${PATH} \
67
+PYTHONPATH=%{buildroot}%{python3_sitelib} \
68
+python3 stresstest.py
69
+popd
62 70
 
63 71
 %files
64 72
 %defattr(-,root,root,-)
... ...
@@ -73,6 +81,8 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
73 73
 %exclude /usr/tests/stresstest.py
74 74
 
75 75
 %changelog
76
+*   Mon Dec 03 2018 Ashwin H <ashwinh@vmware.com> 0.9.1-3
77
+-   Add %check
76 78
 *   Thu Sep 21 2017 Bo Gan <ganb@vmware.com> 0.9.1-2
77 79
 -   Disable test as no tests are available
78 80
 *   Fri Aug 25 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.9.1-1
79 81
new file mode 100644
... ...
@@ -0,0 +1,75 @@
0
+commit 7f3dd65e5dc79cc456ef58a052501ec256d5070b
1
+Author: Giuseppe Lavagetto <lavagetto@gmail.com>
2
+Date:   Mon Feb 13 14:12:39 2017 +0100
3
+
4
+    Support auth API both <= 2.2.5 and >= 2.3.0
5
+    
6
+    Closes #210
7
+
8
+diff --git a/src/etcd/auth.py b/src/etcd/auth.py
9
+index 796772d..c5c7346 100644
10
+--- a/src/etcd/auth.py
11
+@@ -14,13 +14,28 @@ class EtcdAuthBase(object):
12
+         self.name = name
13
+         self.uri = "{}/auth/{}s/{}".format(self.client.version_prefix,
14
+                                            self.entity, self.name)
15
++        # This will be lazily evaluated if not manually set
16
++        self._legacy_api = None
17
++
18
++    @property
19
++    def legacy_api(self):
20
++        if self._legacy_api is None:
21
++            # The auth API has changed between 2.2 and 2.3, true story!
22
++            major, minor, _ = map(int, self.client.version.split('.'))
23
++            self._legacy_api = (major < 3 and minor < 3)
24
++        return self._legacy_api
25
++
26
+ 
27
+     @property
28
+     def names(self):
29
+         key = "{}s".format(self.entity)
30
+         uri = "{}/auth/{}".format(self.client.version_prefix, key)
31
+         response = self.client.api_execute(uri, self.client._MGET)
32
+-        return json.loads(response.data.decode('utf-8'))[key]
33
++        if self.legacy_api:
34
++            return json.loads(response.data.decode('utf-8'))[key]
35
++        else:
36
++            return [obj[self.entity]
37
++                    for obj in json.loads(response.data.decode('utf-8'))[key]]
38
+ 
39
+     def read(self):
40
+         try:
41
+@@ -102,7 +117,16 @@ class EtcdUser(EtcdAuthBase):
42
+ 
43
+     def _from_net(self, data):
44
+         d = json.loads(data.decode('utf-8'))
45
+-        self.roles = d.get('roles', [])
46
++        roles = d.get('roles', [])
47
++        try:
48
++            self.roles = roles
49
++        except TypeError:
50
++            # with the change of API, PUT responses are different
51
++            # from GET reponses, which makes everything so funny.
52
++            # Specifically, PUT responses are the same as before...
53
++            if self.legacy_api:
54
++                raise
55
++            self.roles = [obj['role'] for obj in roles]
56
+         self.name = d.get('user')
57
+ 
58
+     def _to_net(self, prevobj=None):
59
+diff --git a/src/etcd/tests/test_auth.py b/src/etcd/tests/test_auth.py
60
+index 14475f9..5c8c0b0 100644
61
+--- a/src/etcd/tests/test_auth.py
62
+@@ -93,6 +93,10 @@ class EtcdUserTest(TestEtcdAuthBase):
63
+         self.assertEquals(u.roles, set(['guest', 'root']))
64
+         # set roles as a list, it works!
65
+         u.roles = ['guest', 'test_group']
66
++        # We need this or the new API will return an internal error
67
++        r = auth.EtcdRole(self.client, 'test_group')
68
++        r.acls = {'*': 'R', '/test/*': 'RW'}
69
++        r.write()
70
+         try:
71
+             u.write()
72
+         except:
... ...
@@ -3,12 +3,13 @@
3 3
 
4 4
 Name:           python-etcd
5 5
 Version:        0.4.5
6
-Release:        1%{?dist}
6
+Release:        2%{?dist}
7 7
 Summary:        Python API for etcd
8 8
 License:        MIT
9 9
 Group:          Development/Languages/Python
10 10
 Url:            https://pypi.python.org/pypi/python-etcd
11 11
 Source0:        %{name}-%{version}.tar.gz
12
+Patch0:         auth-api-compatibility.patch
12 13
 %define sha1    python-etcd=9e79ae82429cf2ffbe2b5647e14bc29571afd766
13 14
 Vendor:         VMware, Inc.
14 15
 Distribution:   Photon
... ...
@@ -18,6 +19,15 @@ BuildRequires:  python2-devel
18 18
 BuildRequires:  python2-libs
19 19
 BuildRequires:  python-pip
20 20
 BuildRequires:  python-setuptools
21
+%if %{with_check}
22
+BuildRequires:  python-dnspython
23
+BuildRequires:  python-urllib3
24
+BuildRequires:  python-pyOpenSSL
25
+BuildRequires:  etcd
26
+BuildRequires:  openssl-devel
27
+BuildRequires:  curl-devel
28
+BuildRequires:  libffi-devel
29
+%endif
21 30
 Requires:       python2
22 31
 Requires:       python2-libs
23 32
 Requires:       python-setuptools
... ...
@@ -33,12 +43,18 @@ BuildRequires:  python3-devel
33 33
 BuildRequires:  python3-libs
34 34
 BuildRequires:  python3-pip
35 35
 BuildRequires:  python3-setuptools
36
+%if %{with_check}
37
+BuildRequires:  python3-dnspython
38
+BuildRequires:  python3-urllib3
39
+BuildRequires:  python3-pyOpenSSL
40
+%endif
36 41
 
37 42
 %description -n python3-etcd
38 43
 Python3 API for etcd
39 44
 
40 45
 %prep
41 46
 %setup -n %{name}-%{version}
47
+%patch0 -p1
42 48
 rm -rf ../p3dir
43 49
 cp -a . ../p3dir
44 50
 
... ...
@@ -54,6 +70,14 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
54 54
 popd
55 55
 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
56 56
 
57
+%check
58
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)
59
+$easy_install_2 nose
60
+python2 setup.py test
61
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)
62
+$easy_install_3 nose
63
+python3 setup.py test
64
+
57 65
 %files
58 66
 %defattr(-,root,root,-)
59 67
 %{python2_sitelib}/*
... ...
@@ -63,5 +87,7 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
63 63
 %{python3_sitelib}/*
64 64
 
65 65
 %changelog
66
+*   Tue Dec 04 2018 Ashwin H<ashwinh@vmware.com> 0.4.5-2
67
+-   Add %check
66 68
 *   Sat Aug 26 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.4.5-1
67 69
 -   Initial version of python etcd for PhotonOS.
... ...
@@ -5,7 +5,7 @@
5 5
 Summary:        Query Language for JSON
6 6
 Name:           python-jmespath
7 7
 Version:        0.9.3
8
-Release:        1%{?dist}
8
+Release:        2%{?dist}
9 9
 License:        MIT
10 10
 Group:          Development/Languages/Python
11 11
 Vendor:         VMware, Inc.
... ...
@@ -18,6 +18,14 @@ BuildRequires:  python2-libs
18 18
 BuildRequires:  python2-devel
19 19
 BuildRequires:  python-setuptools
20 20
 BuildRequires:  python-xml
21
+BuildRequires:  python3-devel
22
+BuildRequires:  python3-libs
23
+BuildRequires:  python3-setuptools
24
+BuildRequires:  python3-xml
25
+%if %{with_check}
26
+BuildRequires:  openssl-devel
27
+BuildRequires:  curl-devel
28
+%endif
21 29
 Requires:       python2
22 30
 Requires:       python2-libs
23 31
 BuildArch:      noarch
... ...
@@ -27,10 +35,6 @@ JMESPath (pronounced “james path”) allows you to declaratively specify how t
27 27
 
28 28
 %package -n     python3-jmespath
29 29
 Summary:        python-jmespath
30
-BuildRequires:  python3-devel
31
-BuildRequires:  python3-libs
32
-BuildRequires:  python3-setuptools
33
-BuildRequires:  python3-xml
34 30
 Requires:       python3
35 31
 Requires:       python3-libs
36 32
 
... ...
@@ -58,8 +62,12 @@ popd
58 58
 python2 setup.py install --single-version-externally-managed -O1 --root=%{buildroot}
59 59
 
60 60
 %check
61
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)
62
+$easy_install_2 nose
61 63
 python2 setup.py test
62 64
 pushd ../p3dir
65
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)
66
+$easy_install_3 nose
63 67
 python3 setup.py test
64 68
 popd
65 69
 
... ...
@@ -74,5 +82,8 @@ popd
74 74
 %{_bindir}/jp.py-%{python3_version}
75 75
 
76 76
 %changelog
77
+*   Wed Nov 28 2018 Tapas Kundu <tkundu@vmware.com> 0.9.3-2
78
+-   Fix make check
79
+-   moved the build requires from subpackages
77 80
 *   Sun Jan 07 2018 Kumar Kaushik <kaushikk@vmware.com> 0.9.3-1
78 81
 -   Initial packaging for photon.
79 82
new file mode 100644
... ...
@@ -0,0 +1,14 @@
0
+--- a/src/lxml/tests/test_threading.py	2018-11-28 23:02:48.320893543 +0530
1
+@@ -153,9 +153,9 @@ class ThreadingTestCase(HelperTestCase):
2
+             self.assertTrue(len(log))
3
+             if last_log is not None:
4
+                 self.assertEqual(len(last_log), len(log))
5
+-            self.assertEqual(4, len(log))
6
++            self.assertTrue(len(log) >= 2, len(log))
7
+             for error in log:
8
+-                self.assertTrue(':ERROR:XSLT:' in str(error))
9
++                self.assertTrue(':ERROR:XSLT:' in str(error), str(error))
10
+             last_log = log
11
+ 
12
+     def test_thread_xslt_apply_error_log(self):
... ...
@@ -3,12 +3,13 @@
3 3
 Summary:        XML and HTML with Python
4 4
 Name:           python-lxml
5 5
 Version:        4.2.4
6
-Release:        1%{?dist}
6
+Release:        2%{?dist}
7 7
 Group:          Development/Libraries
8 8
 License:        BSD
9 9
 URL:            http://lxml.de
10 10
 Source0:        https://pypi.python.org/packages/39/e8/a8e0b1fa65dd021d48fe21464f71783655f39a41f218293c1c590d54eb82/lxml-%{version}.tar.gz
11 11
 %define sha1    lxml=4a77c5471dfea2a32fd16475d130350af7d33f85
12
+Patch0:         lxml-make-check-fix.patch
12 13
 Vendor:         VMware, Inc.
13 14
 Distribution:   Photon
14 15
 BuildRequires:  python2-devel
... ...
@@ -17,6 +18,9 @@ BuildRequires:  python-xml
17 17
 BuildRequires:  libxslt
18 18
 BuildRequires:  libxslt-devel
19 19
 BuildRequires:  cython
20
+BuildRequires:  python3
21
+BuildRequires:  python3-devel
22
+BuildRequires:  python3-libs
20 23
 Requires:       python2
21 24
 Requires:       libxslt
22 25
 
... ...
@@ -25,12 +29,6 @@ The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxs
25 25
 
26 26
 %package -n     python3-lxml
27 27
 Summary:        python-lxml
28
-BuildRequires:  python3
29
-BuildRequires:  python3-devel
30
-BuildRequires:  python3-libs
31
-BuildRequires:  libxslt
32
-BuildRequires:  libxslt-devel
33
-BuildRequires:  cython
34 28
 Requires:       libxslt
35 29
 Requires:       python3
36 30
 Requires:       python3-libs
... ...
@@ -40,6 +38,7 @@ Python 3 version.
40 40
 
41 41
 %prep
42 42
 %setup -q -n lxml-%{version}
43
+%patch0 -p1
43 44
 rm -rf ../p3dir
44 45
 cp -a . ../p3dir
45 46
 
... ...
@@ -76,6 +75,9 @@ rm -rf %{buildroot}
76 76
 %{python3_sitelib}/*
77 77
 
78 78
 %changelog
79
+*   Wed Nov 28 2018 Tapas Kundu <tkundu@vmware.com> 4.2.4-2
80
+-   Fix make check
81
+-   moved build requires from subpackage
79 82
 *   Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 4.2.4-1
80 83
 -   Update to version 4.2.4
81 84
 *   Mon Aug 07 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.7.3-3
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Array processing for numbers, strings, records, and objects
5 5
 Name:           python-numpy
6 6
 Version:        1.15.1
7
-Release:        1%{?dist}
7
+Release:        2%{?dist}
8 8
 License:        BSD
9 9
 Group:          Development/Languages/Python
10 10
 Vendor:         VMware, Inc.
... ...
@@ -20,6 +20,14 @@ BuildRequires:  python2-devel
20 20
 BuildRequires:  lapack-devel
21 21
 BuildRequires:  unzip
22 22
 
23
+BuildRequires:  python3
24
+BuildRequires:  python3-devel
25
+BuildRequires:  python3-setuptools
26
+BuildRequires:  python3-xml
27
+%if %{with_check}
28
+BuildRequires:  curl-devel
29
+BuildRequires:  openssl-devel
30
+%endif
23 31
 Requires:       python2
24 32
 Requires:       python2-libs
25 33
 
... ...
@@ -28,10 +36,6 @@ NumPy is a general-purpose array-processing package designed to efficiently mani
28 28
 
29 29
 %package -n     python3-numpy
30 30
 Summary:        python-numpy
31
-BuildRequires:  python3
32
-BuildRequires:  python3-devel
33
-BuildRequires:  python3-setuptools
34
-BuildRequires:  python3-xml
35 31
 Requires:       python3
36 32
 Requires:       python3-libs
37 33
 
... ...
@@ -55,14 +59,14 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
55 55
 
56 56
 %check
57 57
 easy_install_2=$(ls /usr/bin |grep easy_install |grep 2)
58
-$easy_install_2 nose
58
+$easy_install_2 nose pytest
59 59
 mkdir test
60 60
 pushd test
61 61
 PYTHONPATH=%{buildroot}%{python2_sitelib} PATH=$PATH:%{buildroot}%{_bindir} python2 -c "import numpy; numpy.test()"
62 62
 popd
63 63
 
64 64
 easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)
65
-$easy_install_3 nose
65
+$easy_install_3 nose pytest
66 66
 pushd test
67 67
 PYTHONPATH=%{buildroot}%{python3_sitelib} PATH=$PATH:%{buildroot}%{_bindir} python3 -c "import numpy; numpy.test()"
68 68
 popd
... ...
@@ -80,6 +84,8 @@ rm -rf test
80 80
 %{_bindir}/f2py3
81 81
 
82 82
 %changelog
83
+*   Mon Dec 03 2018 Tapas Kundu <tkundu@vmware.com> 1.15.1-2
84
+-   Fixed make check
83 85
 *   Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 1.15.1-1
84 86
 -   Update to version 1.15.1
85 87
 *   Fri Aug 25 2017 Alexey Makhalov <amakhalov@vmware.com> 1.12.1-5
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        A high-level scripting language
2 2
 Name:           python3
3 3
 Version:        3.7.0
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        PSF
6 6
 URL:            http://www.python.org/
7 7
 Group:          System Environment/Programming
... ...
@@ -207,6 +207,7 @@ rm -rf %{buildroot}/*
207 207
 %exclude %{_libdir}/python3.7/lib-dynload/pyexpat*.so
208 208
 %exclude %{_libdir}/python3.7/curses
209 209
 %exclude %{_libdir}/python3.7/lib-dynload/_curses*.so
210
+%exclude %{_libdir}/python3.7/distutils/command/wininst-*.exe
210 211
 
211 212
 %files  xml
212 213
 %{_libdir}/python3.7/xml/*
... ...
@@ -256,6 +257,8 @@ rm -rf %{buildroot}/*
256 256
 %{_libdir}/python3.7/test/*
257 257
 
258 258
 %changelog
259
+*   Tue Dec 04 2018 Tapas Kundu <tkundu@vmware.com> 3.7.0-2
260
+-   Excluded windows installer from python3 libs packaging.
259 261
 *   Wed Sep 26 2018 Tapas Kundu <tkundu@vmware.com> 3.7.0-1
260 262
 -   Updated to version 3.7.0
261 263
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6.1-9
... ...
@@ -83,7 +83,7 @@ index 9033efc..1eeb714 100644
83 83
  #define ERROR_TDNF_OUT_OF_MEMORY        (ERROR_TDNF_SYSTEM_BASE + ENOMEM)
84 84
  #define ERROR_TDNF_NO_DATA              (ERROR_TDNF_SYSTEM_BASE + ENODATA)
85 85
 diff --git a/include/tdnftypes.h b/include/tdnftypes.h
86
-index 6aabaf0..2ebc466 100644
86
+index f2fbdb5..d89163c 100644
87 87
 --- a/include/tdnftypes.h
88 88
 +++ b/include/tdnftypes.h
89 89
 @@ -160,6 +160,7 @@ typedef struct _TDNF_SOLVED_PKG_INFO
... ...
@@ -95,7 +95,7 @@ index 6aabaf0..2ebc466 100644
95 95
      PTDNF_PKG_INFO pPkgsExisting;
96 96
      PTDNF_PKG_INFO pPkgsToInstall;
97 97
 diff --git a/solv/prototypes.h b/solv/prototypes.h
98
-index 1865b99..0fd08a5 100644
98
+index 2484649..9789316 100644
99 99
 --- a/solv/prototypes.h
100 100
 +++ b/solv/prototypes.h
101 101
 @@ -246,6 +246,17 @@ SolvFindHighestOrLowestInstalled(
... ...
@@ -117,16 +117,13 @@ index 1865b99..0fd08a5 100644
117 117
  uint32_t
118 118
  SolvCreateSack(
119 119
 diff --git a/solv/tdnfpackage.c b/solv/tdnfpackage.c
120
-index d394f07..3a926a1 100644
120
+index 9631cde..80c33c2 100644
121 121
 --- a/solv/tdnfpackage.c
122 122
 +++ b/solv/tdnfpackage.c
123
-@@ -1558,4 +1558,119 @@ cleanup:
124
- 
125
- error:
126
-     goto cleanup;
127
--}
128
-\ No newline at end of file
129
-+}
123
+@@ -1673,3 +1673,118 @@ SolvIsGlob(
124
+     }
125
+     return nResult;
126
+ }
130 127
 +
131 128
 +uint32_t
132 129
 +SolvGetNevraFromId(
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        dnf/yum equivalent using C libs
5 5
 Name:           tdnf
6 6
 Version:        2.0.0
7
-Release:        2%{?dist}
7
+Release:        3%{?dist}
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 License:        LGPLv2.1,GPLv2
... ...
@@ -21,14 +21,13 @@ BuildRequires:  libsolv-devel
21 21
 BuildRequires:  curl-devel
22 22
 Obsoletes:      yum
23 23
 Provides:       yum
24
-Source0:        %{name}-%{version}-alpha.1.tar.gz
25
-%define sha1    tdnf=625331f1b2e72fdacd64c137667553be1c4236cf
24
+Source0:        %{name}-%{version}-beta.tar.gz
25
+%define sha1    tdnf=3d316ac465bef668f3deeda5b98c9a21c22e8323
26 26
 Source1:        cache-updateinfo
27 27
 Source2:        cache-updateinfo.service
28 28
 Source3:        cache-updateinfo.timer
29 29
 Source4:        updateinfo.sh
30 30
 Patch0:         tdnf-epoch-and-perm.patch
31
-Patch1:         tdnf-crash.patch
32 31
 
33 32
 %description
34 33
 tdnf is a yum/dnf equivalent which uses libsolv and libcurl
... ...
@@ -50,9 +49,8 @@ Group:		Development/Libraries
50 50
 Library providing cli libs for tdnf like clients.
51 51
 
52 52
 %prep
53
-%setup -qn %{name}-%{version}-alpha.1
53
+%setup -qn %{name}-%{version}-beta
54 54
 %patch0 -p1
55
-%patch1 -p1
56 55
 
57 56
 %build
58 57
 autoreconf -i
... ...
@@ -150,6 +148,8 @@ systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :
150 150
     %{_libdir}/libtdnfcli.so.*
151 151
 
152 152
 %changelog
153
+*   Wed Nov 21 2018 Keerthana K <keerthanak@vmware.com> 2.0.0-3
154
+-   Update to 2.0.0 beta release.
153 155
 *   Mon Oct 08 2018 Keerthana K <keerthanak@vmware.com> 2.0.0-2
154 156
 -   Fix bug on tdnf crash when photon-iso repo only enabled without mounting cdrom.
155 157
 *   Fri Feb 09 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.0-1
... ...
@@ -1,7 +1,7 @@
1 1
 Name:           traceroute
2 2
 Summary:        Traces the route taken by packets over an IPv4/IPv6 network
3 3
 Version:        2.1.0
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        GPLv2+
6 6
 Group:          Applications/Internet
7 7
 Url:            http://traceroute.sourceforge.net
... ...
@@ -28,7 +28,6 @@ rm -rf %{buildroot}
28 28
 install -d %{buildroot}/bin
29 29
 install -m755 traceroute/traceroute %{buildroot}/bin
30 30
 pushd %{buildroot}/bin
31
-ln -s traceroute traceroute6
32 31
 popd
33 32
 
34 33
 install -d %{buildroot}%{_bindir}
... ...
@@ -37,7 +36,6 @@ install -m755 wrappers/tcptraceroute %{buildroot}%{_bindir}
37 37
 install -d %{buildroot}%{_mandir}/man8
38 38
 install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
39 39
 pushd %{buildroot}%{_mandir}/man8
40
-ln -s traceroute.8 traceroute6.8
41 40
 ln -s traceroute.8 tcptraceroute.8
42 41
 popd
43 42
 
... ...
@@ -53,6 +51,8 @@ rm -rf $RPM_BUILD_ROOT
53 53
 
54 54
 
55 55
 %changelog
56
+*   Fri Nov 30 2018 Ashwin H <ashwinh@vmware.com> 2.1.0-3
57
+-   Remove traceroute6 softlink as iputils provides traceroute6
56 58
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
57 59
 -   Ensure non empty debuginfo
58 60
 *   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.0-1
... ...
@@ -18,6 +18,7 @@ This information is intended for Photon OS administrators and developers:
18 18
 |Download and Install Photon OS.|[Installation Guide](photon_installation/README.md)|
19 19
 |Fundamentals of administering Photon OS. Basics of managing packages, controlling services with systemd, setting up networking, and initializing Photon OS. |[Administration Guide](photon_admin/README.md)|
20 20
 |Use Photon OS.|[User Guide](photon_user/README.md)|
21
+|Use Photon OS command-line utilities.|[Command-Line Interface Reference](photon_cli/README.md)|
21 22
 |Solutions for common problems that you might encounter while using Photon OS.|[Troubleshooting Guide](photon_troubleshoot/README.md)|
22 23
 
23 24
 ----------
... ...
@@ -20,29 +20,29 @@
20 20
         * [Use Cached Sources](photon_installation/use_cached_sources.md)
21 21
         * [View Build Logs](photon_installation/view_build_logs.md)
22 22
     - [Running Photon OS on vSphere](photon_installation/Running-Photon-OS-on-vSphere.md)
23
-        - [Prerequisites](photon_installation/photon_os_vsphere_prerequisites.md)
23
+        - [Prerequisites for Running Photon OS on vSphere](photon_installation/photon_os_vsphere_prerequisites.md)
24 24
         - [Importing the OVA for Photon OS 3.0](photon_installation/importing_ova_for_photon_os_3.0.md)
25 25
         - [Installing the ISO Image for Photon OS 3.0](photon_installation/installing-the-iso-image-for-photon-os-30.md)
26 26
     - [Running Photon OS on Fusion](photon_installation/Running-Project-Photon-on-Fusion.md)
27
-        - [Prerequisites](photon_installation/photon_os_fusion_prerequisites.md)
28
-        - [Importing the OVA for Photon OS 3.0](photon_installation/importing-the-ova-for-photon-os-3.0-fusion.md)
27
+        - [Prerequisites for Running Photon OS on Fusion](photon_installation/photon_os_fusion_prerequisites.md)
28
+        - [Importing the OVA for Photon OS 3.0](photon_installation/importing-ova-for-photon-os-3.0-fusion.md)
29 29
         - [Installing the ISO Image for Photon OS 3.0](photon_installation/installing-the-iso-image-for-photon-os-30-fusion.md)
30 30
     - [Running Photon OS on Workstation](photon_installation/Running-Photon-OS-on-Workstation.md)
31
-        - [Prerequisites](photon_installation/photon_os_workstation_prerequisites.md)
31
+        - [Prerequisites for Running Photon OS on Workstation](photon_installation/photon_os_workstation_prerequisites.md)
32 32
         - [Importing the OVA for Photon OS 3.0](photon_installation/importing_ova_for_photon_os_3.0-workstation.md)
33 33
         - [Installing the ISO Image for Photon OS 2.0](photon_installation/installing-the-iso-image-for-photon-os-30-workstation.md)
34 34
     - [Running Photon OS on AWS EC2](photon_installation/Running-Photon-OS-on-Amazon-Elastic-Cloud-Compute.md)
35
-        - [Prerequisites](photon_installation/photon_os_ecc_prerequisites.md)
35
+        - [Prerequisites for Running Photon OS on AWS EC2](photon_installation/photon_os_ecc_prerequisites.md)
36 36
         - [Set Up Photon OS on EC2](photon_installation/set-up-PhotonOS-on-ec2.md)
37 37
         - [Deploy a Containerized Application in Photon OS using SSH](photon_installation/deploying-a-containerized-application-in-photon-os-ssh.md)
38 38
         - [Launch the Web Server with Cloud-Init](photon_installation/launch-web-server-with-cloud-init.md)
39 39
         - [Terminate the AMI Instance](photon_installation/terminate-the-ami-instance.md)
40 40
     - [Running Photon OS on Microsoft Azure](photon_installation/Running-Photon-OS-on-Microsoft-Azure.md)
41
-        - [Prerequisites](photon_installation/photon-os-azure-prerequisites.md)
41
+        - [Prerequisites for Running Photon OS on Azure](photon_installation/photon-os-azure-prerequisites.md)
42 42
         - [Set Up Azure Storage and Uploading the VHD](photon_installation/setting-up-azure-storage-and-uploading-the-vhd.md)
43 43
         - [Remove Photon OS From Azure](photon_installation/remove-photon-os-from-azure.md)
44 44
     - [Running Photon OS on Google Compute Engine](photon_installation/Running-Photon-OS-on-Google-Compute-Engine.md)
45
-        - [Prerequisites for Photon OS on GCE](photon_installation/photon-os-gce-prerequisites.md)
45
+        - [Prerequisites for Running Photon OS on GCE](photon_installation/photon-os-gce-prerequisites.md)
46 46
         - [Installing Photon OS on Google Compute Engine](photon_installation/installing-photon-os-on-google-compute-engine.md)
47 47
     - [Deploying a Containerized Application in Photon OS](photon_installation/deploying-a-containerized-application-in-photon-os.md)
48 48
     - [Installing and Using Lightwave on Photon OS](photon_installation/Installing-and-Using-Lightwave-on-Photon-OS.md)
... ...
@@ -53,10 +53,7 @@
53 53
         - [Remotely Upgrade Multiple Photon OS Machines With Lightwave Client and Photon Management Daemon Installed](photon_installation/Remotely-Upgrade-Photon-OS-Machine-With-Lightwave-Client-and-Photon-Management-Daemon-Installed.md)
54 54
     - [Photon Management Daemon](photon_installation/using-the-photon-management-daemon.md)
55 55
         - [Installing the pmd Package](photon_installation/installing_pmd_package.md)
56
-        - [Available APIs](photon_installation/available_apis.md)
57
-    - [Command-line Interfaces](photon_installation/command-line_interfaces.md)
58
-        - [Photon Management Daemon Command-line Interface (pmd-cli)](photon_installation/pmd-cli.md)
59
-        - [Photon Network Manager Command-line Interface (netmgr)](photon_installation/netmgr-cli.md)   
56
+        - [Available APIs](photon_installation/available_apis.md)   
60 57
 - [Administration Guide](photon_admin/README.md)
61 58
     - [Photon OS Packages](photon_admin/photon_os_packages.md) 
62 59
         - [Examining the Packages in the SPECS Directory on Github](photon_admin/examining_packages_spec_dir.md)
... ...
@@ -103,6 +100,7 @@
103 103
         - [Network Configuration Manager - C API](photon_admin/netmgr.c.md)
104 104
         - [Network Configuration Manager - Python API](photon_admin/netmgr.python.md)
105 105
     -   [Cloud-Init on Photon OS](photon_admin/cloud-init-on-photon-os.md)
106
+        - [Cloud-Init Overview](photon_admin/cloud-init.md)
106 107
         - [Deploy Photon OS With cloud-init](photon_admin/deploy_photon_with_cloud-init.md) 
107 108
         - [Creating a Stand-Alone Photon Machine with cloud-init](photon_admin/creating-a-stand-alone-photon-machine-with-cloud-init.md)
108 109
         -   [Customizing a Photon OS Machine on EC2](photon_admin/customizing-a-photon-os-machine-on-ec2.md)
... ...
@@ -126,6 +124,53 @@
126 126
             - [Configure Kubernetes Services on Master](photon_user/configure_kubernetes_on_master.md)
127 127
             - [Configure Kubernetes Services on Node](photon_user/configure_kubernetes_on_node.md)
128 128
     - [Mounting Remote File Systems](photon_user/nfs-utils.md)
129
-- [Troubleshooting](photon_troubleshoot/README.md)
130
-- [Frequently Asked Questions](Frequently-Asked-Questions.md)
131
-* [Security Advisories](https://github.com/vmware/photon/wiki/Security-Advisories)
132 129
\ No newline at end of file
130
+- [Command-Line Reference](photon_cli/README.md)
131
+	- [Command-line Interfaces](photon_cli/command-line_interfaces.md)
132
+		- [Photon Management Daemon Command-line Interface (pmd-cli)](photon_cli/pmd-cli.md)
133
+		- [Photon Network Manager Command-line Interface (netmgr)](photon_cli/netmgr-cli.md)
134
+- [Troubleshooting Guide](photon_troubleshoot/README.md)
135
+    - [Introduction](photon_troubleshoot/introduction.md)
136
+        - [Systemd and TDNF](photon_troubleshoot/systemd-and-tdnf.md)
137
+        - [The Root Account and the `sudo` and `su` Commands](photon_troubleshoot/root-account-sudo-and-su-commands.md)
138
+        - [Checking the Version and Build Number](photon_troubleshoot/checking-the-version-and-build-number.md)
139
+        - [General Best Practices](photon_troubleshoot/general-best-practices.md)
140
+        - [Photon OS Logs](photon_troubleshoot/photon-os-logs.md)
141
+        - [Troubleshooting Progression](photon_troubleshoot/troubleshooting-progression.md)
142
+    - [Solutions to Common Problems](photon_troubleshoot/solutions-to-common-problems.md)
143
+        - [Resetting a Lost Root Password](photon_troubleshoot/resetting-a-lost-root-password.md)
144
+        - [Fixing Permissions on Network Configuration Files](photon_troubleshoot/network-config-files-permissions.md)
145
+        - [Permitting Root Login with SSH](photon_troubleshoot/permitting-root-login-with-ssh.md)
146
+        - [Fixing Sendmail](photon_troubleshoot/fixing-sendmail.md)
147
+    - [Troubleshooting Tools on Photon OS](photon_troubleshoot/troubleshooting-tools.md)
148
+        - [Common Tools](photon_troubleshoot/common-tools.md)
149
+        - [Troubleshooting Tools Installed by Default](photon_troubleshoot/default-tools.md)
150
+        - [Installing Tools From Repositories](photon_troubleshoot/installing-tools.md)
151
+        - [Linux Troubleshooting Tools](photon_troubleshoot/linux-troubleshooting-tools.md)
152
+    - [Troubleshooting With systemd](photon_troubleshoot/systemd.md)
153
+        - [Troubleshooting Services with `systemctl`](photon_troubleshoot/troubleshooting-services.md)
154
+        - [Analyzing System Logs with `journalctl`](photon_troubleshoot/analyzing-system-logs-with-journalctl.md)
155
+        - [Inspecting Services with `systemd-analyze`](photon_troubleshoot/inspecting-services-with-systemd-analyze.md)
156
+    - [Network Troubleshooting](photon_troubleshoot/networking.md)
157
+        - [Managing the Network Configuration](photon_troubleshoot/managing-the-network-configuration.md)
158
+        - [Inspecting IP Addresses](photon_troubleshoot/inspecting-ip-addresses.md)
159
+        - [Inspecting the Status of Network Links with `networkctl`](photon_troubleshoot/inspecting-network-links-with-networkctl.md)
160
+        - [Network Debugging](photon_troubleshoot/network-debugging.md)
161
+        - [Checking Firewall Rules](photon_troubleshoot/checking-firewall-rules.md)
162
+        - [Inspect Network Settings with `netmgr`](photon_troubleshoot/netmgr.md)
163
+    - [File System Troubleshooting](photon_troubleshoot/file-system.md)
164
+        - [Checking Disk Space](photon_troubleshoot/checking-disk-space.md)
165
+        - [Adding a Disk and Partitioning It](photon_troubleshoot/adding-a-disk-and-partitioning-it.md)
166
+        - [Expanding Disk Partition](photon_troubleshoot/expanding-disk-partition.md)
167
+        - [List Disk Partitions](photon_troubleshoot/fdisk.md)
168
+        - [File System Consistency Check Tool](photon_troubleshoot/fsck.md)
169
+        - [Fixing File System Errors When fsck Fails](photon_troubleshoot/fixing-file-system-errors-when-fsck-fails.md)
170
+    - [Troubleshooting Packages](photon_troubleshoot/packages.md)
171
+    - [Kernel Problems and Boot and Login Problems](photon_troubleshoot/kernel-problems-and-boot-and-login-errors.md)
172
+        - [Kernel Overview](photon_troubleshoot/kernel-overview.md)
173
+        - [Boot Process Overview](photon_troubleshoot/boot-process-overview.md)
174
+        - [Blank Screen on Reboot](photon_troubleshoot/blank-screen-on-reboot.md)
175
+        - [Investigating Unexpected Behavior](photon_troubleshoot/investigating-strange-behavior.md)
176
+        - [Investigating the Guest Kernel](photon_troubleshoot/investigating-the-guest-kernel.md)
177
+        - [Kernel Log Replication with VProbes](photon_troubleshoot/kernel-log-replication-with-vprobes.md)
178
+    -   [Performance Issues](photon_troubleshoot/performance-issues.md)
179
+- [Security Advisories](https://github.com/vmware/photon/wiki/Security-Advisories)
133 180
\ No newline at end of file
134 181
deleted file mode 100644
... ...
@@ -1,3 +0,0 @@
1
-# Upgrading the Kernel Version Requires Grub Changes for AWS and GCE Images
2
-
3
-If you upgrade the Photon OS Linux kernel with `tdnf upgrade linux`, you must modify the `/boot/grub2/grub.cfg` file to reflect the correct kernel version so that it works with AWS and GCE images. For example, if you install Photon OS 1.0 with kernel 4.4.8 and then upgrade the Linux kernel to 4.4.26, you must edit the /boot/grub2/grub.cfg file to replace the line containing `linux /boot/vmlinuz-4.4.8` with `linux /boot/vmlinuz-4.4.26`.
4 1
\ No newline at end of file
5 2
deleted file mode 100644
... ...
@@ -1,132 +0,0 @@
1
-# Compatible Cloud Images
2
-
3
-The [Bintray website](https://bintray.com/vmware/photon/) contains the following cloud-ready images of Photon OS: 
4
-
5
-1. GCE - Google Compute Engine
6
-
7
-1. AMI - Amazon Machine Image
8
-
9
-1. OVA
10
-
11
-Because the cloud-ready images of Photon OS are built to be compatible with their corresponding cloud platform or format, you typically do not need to build a cloud image--just go to Bintray and download the image for the platform that you are working on. 
12
-
13
-If, however, you want to build your own cloud image, perhaps because you seek to customize the code, see the next section on how to build cloud images.
14
-
15
-## How to build cloud images
16
-
17
-	sudo make cloud-image IMG_NAME=image-name
18
-
19
-	image-name: gce/ami/azure/ova
20
-
21
-The output of the build process produces the following file formats:
22
-
23
-GCE - A tar file consisting of disk.raw as the raw disk file 
24
-
25
-AMI - A raw disk file
26
-
27
-<!-- Azure - A vhd file -->
28
-
29
-OVA - An ova file (vmdk + ovf)
30
-
31
-If you want, you can build all the cloud images by running the following command: 
32
-
33
-	sudo make cloud-image-all 
34
-
35
-<!-- ###How to build Photon bosh-stemcell
36
-
37
-Please follow the link to [build](https://github.com/cloudfoundry/bosh/blob/develop/bosh-stemcell/README.md) Photon bosh-stemcell
38
-
39
-## How to create running instances in the cloud
40
-
41
-The following sections contain some high-level instructions on how to create instances of Photon OS in the Google Compute Engine (GCE) and Amazon Elastic Cloud Compute (EC2). For more information, see the Amazon or Google cloud documentation. 
42
-
43
-### GCE
44
-
45
-The tar file can be uploaded to Google's cloud storage and an instance can be created after creating an image from the tar file. You will need the Google Cloud SDK on your host machine to upload the image and create instances.
46
-
47
-####Install Google cloud SDK on host machine
48
-
49
-	curl https://sdk.cloud.google.com | bash
50
-
51
-####Upload the tar file
52
-
53
-	gsutil cp photon-gce.tar.gz gs://bucket-name
54
-
55
-####Create image
56
-
57
-	gcloud compute --project project-id images create image-name --description description --source-uri https://storage.googleapis.com/bucket-name/photon-gce.tar.gz
58
-
59
-####Create instance of GCE
60
-
61
-	gcloud compute --project project-id instances create instance-name --zone "us-central1-f" --machine-type "n1-standard-1" other-options
62
-
63
-(You can also create instances from the Google developer console.)
64
-
65
-For more information, see [Running a Photon OS Machine on GCE](photon-admin-guide.md#running-a-photon-os-machine-on-gce). 
66
-
67
-### AWS EC2
68
-
69
-Install the [AWS CLI](http://docs.aws.amazon.com/cli/latest/userguide/installing.html#install-bundle-other-os) and [EC2 CLI](http://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/set-up-ec2-cli-linux.html) tools. 
70
-
71
-####Bundle the image
72
-
73
-	ec2-bundle-image -c cert.pem -k private-key.pem -u $AWS_USER_ID --arch x86_64 --image photon-ami.raw --destination directory-name
74
-
75
-####Upload the bundle
76
-
77
-	ec2-upload-bundle --manifest directory-name/photon-ami.raw.manifest.xml --bucket bucket-name --access-key $AWS_ACCESS_KEY --secret-key $AWS_SECRET_KEY
78
-
79
-####Register the AMI
80
-
81
-	ec2-register bucket-name/photon-ami.raw.manifest.xml --name name --architecture x86_64 --virtualization-type hvm
82
-
83
-You can now launch instances using the AWS console.
84
-
85
-For more information, see [Customizing a Photon OS Machine on EC2](photon-admin-guide.md#customizing-a-photon-os-machine-on-ec2).
86
-
87
-
88
-<!--
89
-##AZURE
90