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

 Summary:	XML-Parser perl module

 Name:		XML-Parser

 Version:	2.44

-Release:	5%{?dist}

+Release:	6%{?dist}

 License:	GPL+

 URL:		http://search.cpan.org/~toddr/%{name}-%{version}/

 Source0:		http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/%{name}-%{version}.tar.gz

@@ -18,7 +18,18 @@ The XML::Parser module is a Perl extension interface to James Clark's XML parser

 %prep

 %setup -q

 %build

-perl Makefile.PL --prefix=%{_prefix}

+perl Makefile.PL

+if [ %{_host} != %{_build} ]; then

+  ln -s /target-%{_arch}%{perl_privlib}/%{_arch}-linux %{perl_privlib}/%{_arch}-linux

+  mkdir -p %{perl_vendorlib}

+  ln -s /target-%{_arch}%{perl_vendorlib}/%{_arch}-linux %{perl_vendorlib}/%{_arch}-linux

+

+  # ugly hack again, similarly to cmake:

+  ln -sf %{_arch}-linux-gnu-gcc /usr/bin/gcc

+  ln -sf %{_arch}-linux-gnu-g++ /usr/bin/g++

+  ln -sf %{_arch}-linux-gnu-ld /usr/bin/ld

+  ln -sf %{_arch}-linux-gnu-ar /usr/bin/ar

+fi

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -34,6 +45,8 @@ make %{?_smp_mflags} test

 %{_libdir}/perl5/*

 %{_mandir}/man3/*

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 2.44-6

+-   Cross compilation support

 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 2.44-5

 -   Consuming perl version upgrade of 5.28.0

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.44-4

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

 Summary:	Check-0.12.0

 Name:		check

 Version:	0.12.0

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	LGPLv2+

 URL:		http://check.sourceforge.net/

 Source0:	https://github.com/libcheck/check/archive/%{name}-%{version}.tar.gz

@@ -9,15 +9,16 @@ Source0:	https://github.com/libcheck/check/archive/%{name}-%{version}.tar.gz

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution: Photon

+Requires:       gawk

 %description

-Check is a unit testing framework for C. It features a simple interface for defining unit tests, 

-putting little in the way of the developer. Tests are run in a separate address space, 

+Check is a unit testing framework for C. It features a simple interface for defining unit tests,

+putting little in the way of the developer. Tests are run in a separate address space,

 so both assertion failures and code errors that cause segmentation faults or other signals can be caught.

 %prep

 %setup -q

 %build

 autoreconf --install

-./configure --prefix=%{_prefix}

+%configure

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -39,6 +40,9 @@ make %{?_smp_mflags} check

 /usr/share/doc/%{name}/*

 /usr/share/aclocal/*

 %changelog

+*   Thu Nov 08 2018 Alexey Makhalov <amakhalov@vmware.com> 0.12.0-2

+-   Cross compilation support

+-   Added required gawk

 *   Wed Sep 19 2018 Ajay Kaher <akaher@vmware.com> 0.12.0-1

 -   Upgraded to version 0.12.0

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.10.0-2

new file mode 100644

@@ -0,0 +1,49 @@

+From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001

+From: "Roy.Li" <rongqing.li@windriver.com>

+Date: Tue, 25 Jun 2013 09:22:59 +0800

+Subject: [PATCH] Avoid to call AC_TRY_RUN

+

+Upstream-Status: Inappropriate [configuration]

+

+Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO

+on cross-compile environment by definition AC_ARG_ENABLE enable-spnego

+

+Signed-off-by: Roy.Li <rongqing.li@windriver.com>

+

+---

+ m4/sasl2.m4 | 15 +++++++++++++--

+ 1 file changed, 13 insertions(+), 2 deletions(-)

+

+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4

+index 56e0504..cf62607 100644

+--- a/m4/sasl2.m4

+@@ -314,7 +314,18 @@ if test "$gssapi" != no; then

+   cmu_save_LIBS="$LIBS"

+   LIBS="$LIBS $GSSAPIBASE_LIBS"

+ 

+-  AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])

++  AC_ARG_ENABLE([spnego],

++              [AC_HELP_STRING([--enable-spnego=<DIR>],

++                              [enable SPNEGO support in GSSAPI libraries [no]])],

++              [spnego=$enableval],

++              [spnego=no])

++

++  if test "$spnego" = no; then

++       echo "no"

++  elif test "$spnego" = yes; then

++       AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])

++  else

++       AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])

+   AC_TRY_RUN([

+ #ifdef HAVE_GSSAPI_H

+ #include <gssapi.h>

+@@ -341,7 +352,7 @@ int main(void)

+ 	AC_MSG_RESULT(yes) ],

+ 	AC_MSG_RESULT(no))

+   LIBS="$cmu_save_LIBS"

+-

++   fi

+ else

+   AC_MSG_RESULT([disabled])

+ fi

new file mode 100644

@@ -0,0 +1,30 @@

+diff --git a/include/Makefile.am b/include/Makefile.am

+index 5ea5be2..c942efa 100644

+--- a/include/Makefile.am

+@@ -51,9 +51,15 @@ noinst_PROGRAMS = makemd5

+ 

+ makemd5_SOURCES = makemd5.c

+ 

+-md5global.h: makemd5

+-	-rm -f md5global.h

+-	./makemd5 md5global.h

++makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CC=gcc

++makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD)

++makemd5$(BUILD_EXEEXT): LDFLAGS=$(LDFLAGS_FOR_BUILD)

++

++md5global.h: makemd5$(BUILD_EXEEXT) Makefile

++	-rm -f $@

++	./$< $@

++

++BUILT_SOURCES = md5global.h

+ 

+ EXTRA_DIST = NTMakefile

+ DISTCLEANFILES = md5global.h

+@@ -63,3 +69,6 @@ framedir = /Library/Frameworks/SASL2.framework

+ frameheaderdir = $(framedir)/Versions/A/Headers

+ frameheader_DATA = $(saslinclude_HEADERS)

+ endif

++

++# TODO: automake, don't build it

++makemd5$(EXEEXT):

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

 Summary:        Cyrus Simple Authentication Service Layer (SASL) library

 Name:           cyrus-sasl

 Version:        2.1.26

-Release:        14%{?dist}

+Release:        15%{?dist}

 License:        Custom

 URL:            http://cyrusimap.web.cmu.edu/

 Group:          System Environment/Security

@@ -11,6 +11,8 @@ Source0:        ftp://ftp.cyrusimap.org/cyrus-sasl/%{name}-%{version}.tar.gz

 %define sha1    cyrus-sasl=d6669fb91434192529bd13ee95737a8a5040241c

 Patch0:         http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch

 Patch1:         cyrus-sasl-mem-leak-fix.patch

+Patch2:         cyrus-sasl-2.1.26-fix-cross-compiling.patch

+Patch3:         avoid-to-call-AC_TRY_RUN.patch

 BuildRequires:  systemd

 BuildRequires:  openssl-devel

 BuildRequires:  krb5-devel >= 1.12

@@ -21,29 +23,29 @@ Requires:       krb5 >= 1.12

 Requires:       Linux-PAM

 Requires:       systemd

 %description

-The Cyrus SASL package contains a Simple Authentication and Security 

-Layer, a method for adding authentication support to 

+The Cyrus SASL package contains a Simple Authentication and Security

+Layer, a method for adding authentication support to

 connection-based protocols. To use SASL, a protocol includes a command

-for identifying and authenticating a user to a server and for 

+for identifying and authenticating a user to a server and for

 optionally negotiating protection of subsequent protocol interactions.

-If its use is negotiated, a security layer is inserted between the 

+If its use is negotiated, a security layer is inserted between the

 protocol and the connection.

 %prep

 %setup -q

 %patch0 -p1

 %patch1 -p1

+if [ %{_host} != %{_build} ]; then

+%patch2 -p1

+%patch3 -p1

+fi

 %build

 autoreconf -fi

 pushd saslauthd

 autoreconf -fi

 popd

-./configure \

+%configure \

     CFLAGS="%{optflags} -fPIC" \

     CXXFLAGS="%{optflags}" \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

-    --sysconfdir=/etc \

     --with-plugindir=%{_libdir}/sasl2 \

     --without-dblib \

     --with-saslauthd=/run/saslauthd \

@@ -107,7 +109,7 @@ echo "disable saslauthd.service" > %{buildroot}%{_libdir}/systemd/system-preset/

 make %{?_smp_mflags} check

 %post

-%{_sbindir}/ldconfig 

+%{_sbindir}/ldconfig

 %systemd_post saslauthd.service

 %postun

@@ -134,6 +136,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man8/saslauthd.8.gz

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-15

+-   Cross compilation support

 *   Tue Nov 21 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-14

 -   Update patch for memory leak fix

 *   Tue Oct 10 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-13

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

 Summary:        Basic and advanced IPV4-based networking

 Name:           iproute2

 Version:        4.18.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2+

 URL:            http://www.kernel.org/pub/linux/utils/net/iproute2

 Group:          Applications/System

@@ -33,7 +33,7 @@ sed -i 's/m_ipt.o//' tc/Makefile

 %patch0 -p1

 %build

-make VERBOSE=1 %{?_smp_mflags} DESTDIR= LIBDIR=%{_libdir}

+make CC=%{_host}-gcc VERBOSE=1 %{?_smp_mflags} DESTDIR= LIBDIR=%{_libdir}

 %install

 make    DESTDIR=%{buildroot} \

     MANDIR=%{_mandir} \

@@ -70,6 +70,8 @@ cd ..

 %{_mandir}/man3/*

 %changelog

+*   Wed Jul 03 2019 Alexey Makhalov <amakhalov@vmware.com> 4.18.0-3

+-   Cross compilation support

 *   Fri Mar 08 2019 Fabio Rapposelli <fabio@vmware.com> 4.18.0-2

 -   Added "Provides: iproute" for better compatibility with other distributions

 *   Wed Sep 05 2018 Ankit Jain <ankitja@vmware.com> 4.18.0-1

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

 Summary:        The Kerberos newtork authentication system

 Name:           krb5

 Version:        1.17

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 URL:            http://web.mit.edu/kerberos/

 Group:          System Environment/Security

@@ -41,10 +41,15 @@ cd src &&

 sed -e 's@\^u}@^u cols 300}@' \

     -i tests/dejagnu/config/default.exp &&

 CPPFLAGS="-D_GNU_SOURCE" \

-autoconf &&

+autoconf

+if [ %{_host} != %{_build} ]; then

+  export krb5_cv_attr_constructor_destructor=yes,yes

+  export ac_cv_func_regcomp=yes

+  export ac_cv_printf_positional=yes

+  export ac_cv_file__etc_environment=no

+  export ac_cv_file__etc_TIMEZONE=no

+fi

 %configure \

-    --sysconfdir=/etc \

-        --localstatedir=/var/lib \

         --with-system-et         \

         --with-system-ss         \

         --with-system-verto=no   \

@@ -114,6 +119,8 @@ rm -rf %{buildroot}/*

 %{_datarootdir}/locale/*

 %changelog

+*   Fri Nov 01 2019 Alexey Makhalov <amakhalov@vmware.com> 1.17-2

+-   Cross compilation support

 *   Thu Oct 03 2019 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.17-1

 -   Update to version 1.17

 *   Fri Sep 14 2018 Ankit Jain <ankitja@vmware.com> 1.16.1-1

@@ -4,12 +4,19 @@

 Summary:        POSIX capability Library

 Name:           libcap-ng

 Version:        0.7.9

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPLv2+

 Group:          System Environment/Libraries

+Vendor:		VMware, Inc.

+Distribution: 	Photon

 URL:            http://people.redhat.com/sgrubb/libcap-ng

 Source0:        http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz

 %define sha1    libcap-ng=f29f1eefdfbbd93501d9c7a54ac340d4ca660634

+BuildRequires:  python2-devel

+BuildRequires:  python2-libs

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  swig

 %description

 The libcap-ng library is intended to make programming with posix capabilities much easier than the traditional libcap library. It includes utilities that can analyse all currently running applications and print out any capabilities and whether or not it has an open ended bounding set. An open bounding set without the securebits "NOROOT" flag will allow full capabilities escalation for apps retaining uid 0 simply by calling execve.

@@ -17,9 +24,6 @@ The libcap-ng library is intended to make programming with posix capabilities mu

 %package  -n    python2-libcap-ng

 Summary:        Python bindings for libcap-ng

 License:        LGPLv2+

-BuildRequires:  python2-devel

-BuildRequires:  python2-libs

-BuildRequires:  swig

 Requires:       %{name} = %{version}-%{release}

 Requires:       python2

@@ -29,9 +33,6 @@ The python2-libcap-ng package contains the python2 bindings for libcap-ng.

 %package  -n    python3-libcap-ng

 Summary:        Python3 bindings for libaudit

 License:        LGPLv2+

-BuildRequires:  python3-devel

-BuildRequires:  python3-libs

-BuildRequires:  swig

 Requires:       %{name} = %{version}-%{release}

 Requires:       python3

@@ -49,9 +50,7 @@ The libraries and header files needed for libcap_ng development.

 %setup -q

 %build

-./configure \

-    --prefix=%{_prefix} \

-    --libdir=%{_libdir} \

+%configure \

     --with-python \

     --with-python3

@@ -89,6 +88,8 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %{_libdir}/*.a

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 0.7.9-2

+-   Cross compilation support

 *   Thu Sep 13 2018 Siju Maliakkal <smaliakkal@vmware.com> 0.7.9-1

 -   Updated to latest version

 *   Mon May 22 2017 Xiaolin Li <xiaolinl@vmware.com> 0.7.8-2

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

 Summary:		Libcap

 Name:			libcap

 Version:		2.25

-Release:		8%{?dist}

+Release:		9%{?dist}

 License:		GPLv2+

 URL:			https://www.gnu.org/software/hurd/community/gsoc/project_ideas/libcap.html

 Source0:		https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz

@@ -10,8 +10,8 @@ Group:			System Environment/Security

 Vendor:			VMware, Inc.

 Distribution:	Photon

 %description

-The libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available 

-in Linux kernels. These capabilities are a partitioning of the all powerful root privilege 

+The libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available

+in Linux kernels. These capabilities are a partitioning of the all powerful root privilege

 into a set of distinct privileges.

 %package        devel

@@ -26,12 +26,17 @@ for developing applications that use libcap.

 %prep

 %setup -q

 %build

+if [ %{_host} != %{_build} ]; then

+  MFLAGS="CC=%{_arch}-unknown-linux-gnu-gcc AR=%{_arch}-unknown-linux-gnu-ar RANLIB=%{_arch}-unknown-linux-gnu-ranlib BUILD_CC=gcc"

+else

+  MFLAGS=

+fi

 sed -i 's:LIBDIR:PAM_&:g' pam_cap/Makefile

-make %{?_smp_mflags}

+make %{?_smp_mflags} $MFLAGS

 %install

 make prefix=%{_prefix}	SBINDIR=%{_sbindir} PAM_LIBDIR=%{_libdir} RAISE_SETFCAP=no DESTDIR=%{buildroot} install

 %ifarch aarch64

-mv %{buildroot}%{_libdir} %{buildroot}%{_lib64dir}

+test -d %{buildroot}%{_libdir} && mv %{buildroot}%{_libdir} %{buildroot}%{_lib64dir}

 %endif

 chmod -v 755 %{buildroot}/usr/lib64/libcap.so

 %check

@@ -54,6 +59,8 @@ sed -i "s|pass_capsh --chroot=\$(/bin/pwd) ==||g" quicktest.sh

 %{_mandir}/man3/*

 %changelog

+*   Tue Nov 26 2019 Alexey Makhalov <amakhalov@vmware.com> 2.25-9

+-   Cross compilation support

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.25-8

 -   Aarch64 support

 *   Wed Aug 09 2017 Danut Moraru <dmoraru@vmware.com> 2.25-7

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

 Summary:        A simplified, portable interface to several low-level networking routines

 Name:           libdnet

 Version:        1.11

-Release:        6%{?dist}

+Release:        7%{?dist}

 License:        BSD

 URL:            http://prdownloads.sourceforge.net/libdnet/libdnet-1.11.tar.gz

 Group:          Applications/System

@@ -23,9 +23,7 @@ It contains the libraries and header files to create applications.

 %setup -q

 %patch0 -p1

 %build

-./configure --prefix=/usr "CFLAGS=-fPIC" \

-	--host=%{_host} --build=%{_build} \

-            --mandir=%{_mandir}

+%configure "CFLAGS=-fPIC"

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -36,7 +34,7 @@ make  %{?_smp_mflags} check

 %post   -p /sbin/ldconfig

 %postun -p /sbin/ldconfig

-%files 

+%files

 %defattr(-,root,root)

 %{_bindir}/*

 %{_libdir}/libdnet

@@ -51,6 +49,8 @@ make  %{?_smp_mflags} check

 %{_libdir}/libdnet.a

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 1.11-7

+-   Cross compilation support

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.11-6

 -   Aarch64 support

 *   Thu Aug 03 2017 Kumar Kaushik <kaushikk@vmware.com> 1.11-5

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

 Summary:	A portable, high level programming interface to various calling conventions

 Name:		libffi

 Version:	3.2.1

-Release:	6%{?dist}

+Release:	7%{?dist}

 License:	BSD

 URL:		http://sourceware.org/libffi/

 Group:		System Environment/GeneralLibraries

@@ -16,14 +16,14 @@ BuildRequires:  dejagnu

 %description

 The libffi library provides a portable, high level programming interface

-to various calling conventions. This allows a programmer to call any 

+to various calling conventions. This allows a programmer to call any

 function specified by a call interface description at run time.

 %package    devel

 Summary:    Header and development files for libffi

 Requires:   %{name} = %{version}-%{release}

 %description    devel

-It contains the libraries and header files to create applications 

+It contains the libraries and header files to create applications

 %prep

 %setup -q

@@ -34,12 +34,7 @@ sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(in

 sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@includedir@:' \

     -e 's/^Cflags: -I${includedir}/Cflags:/' \

     -i libffi.pc.in        &&

-./configure \

-	CFLAGS="%{optflags}" \

-	CXXFLAGS="%{optflags}" \

-	--prefix=%{_prefix} \

-	--bindir=%{_bindir} \

-	--libdir=%{_libdir} \

+%configure \

 	--disable-static

 make %{?_smp_mflags}

 %install

@@ -70,6 +65,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man3/*

 %changelog

+*   Fri Nov 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-7

+-   Cross compilation support

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-6

 -   Aarch64 support

 *   Wed Jul 12 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-5

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

 Summary:        Libraries for the public client interface for NIS(YP) and NIS+.

 Name:           libnsl

 Version:        1.2.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 Source0:        https://github.com/thkukuk/libnsl/archive/v1.2.0/libnsl-1.2.0.tar.gz

 %define sha1    libnsl=f141c7cf0ff96d96e369dda36af8ed19af0fc3ca

 License:        GPLv2+

@@ -33,7 +33,7 @@ This package includes header files and libraries necessary for developing progra

 %build

 autoreconf -fi

-%configure

+%configure $(test %{_host} != %{_build} && echo "--with-sysroot=/target-%{_arch}")

 make %{?_smp_mflags}

 %install

@@ -56,5 +56,7 @@ make install DESTDIR=%{buildroot}

 %{_libdir}/*.la

 %changelog

+* Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 1.2.0-2

+- Cross compilation support

 * Fri Sep 21 2018 Alexey Makhalov <amakhalov@vmware.com> 1.2.0-1

 - Initial version

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

 Summary:        libssh2 is a library implementing the SSH2 protocol.

 Name:           libssh2

 Version:        1.8.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 URL:            https://www.libssh2.org/

 Group:          System Environment/NetworkingLibraries

@@ -31,8 +31,15 @@ These are the header files of libssh2.

 %patch0 -p1

 %build

-%configure --disable-static \

-    --enable-shared

+if [ %{_host} != %{_build} ]; then

+  PREFIXES="--with-libssl-prefix=/target-%{_arch}/usr --with-libz-prefix=/target-%{_arch}/usr"

+else

+  PREFIXES=

+fi

+%configure \

+    --disable-static \

+    --enable-shared \

+    $PREFIXES

 make

 %install

@@ -51,6 +58,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'

 %{_mandir}/man3/*

 %changelog

+*   Wed Jul 03 2019 Alexey Makhalov <amakhalov@vmware.com> 1.8.0-3

+-   Cross compilation support

 *   Thu Mar 28 2019 Tapas Kundu <tkundu@vmware.com> 1.8.0-2

 -   Fix for CVE-2019-3855

 *   Wed Nov 30 2016 Xiaolin Li <xiaolinl@vmware.com> 1.8.0-1

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

 Summary:        Libraries for Transport Independent RPC

 Name:           libtirpc

 Version:        1.1.4

-Release:        1%{?dist}

+Release:        2%{?dist}

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

 %define sha1    libtirpc=d85717035cb9bd6c45557a1eb1351d3af9a69ff7

 License:        BSD

@@ -10,7 +10,6 @@ URL:            http://nfsv4.bullopensource.org/

 Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildRequires:  krb5-devel

-BuildRequires:  automake

 BuildRequires:  e2fsprogs-devel

 Requires:       krb5

@@ -38,7 +37,7 @@ This package includes header files and libraries necessary for developing progra

 %setup -q

 %build

-./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}

+%configure

 sed '/stdlib.h/a#include <stdint.h>' -i src/xdr_sizeof.c

 make %{?_smp_mflags}

@@ -67,6 +66,8 @@ make install DESTDIR=%{buildroot}

 %{_libdir}/*.la

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 1.1.4-2

+-   Cross compilation support

 *   Wed Sep 12 2018 Keerthana K <keerthanak@vmware.com> 1.1.4-1

 -   Update to version 1.1.4

 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.1-7

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

 Summary:        Libxslt-1.1.29

 Name:           libxslt

 Version:        1.1.32

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 URL:            http:/http://xmlsoft.org/libxslt/

 Group:          System Environment/General Libraries

@@ -24,10 +24,8 @@ Header files for doing development with libxslt.

 %prep

 %setup -q

 %build

-./configure \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

+%configure \

+    $(test %{_host} != %{_build} && echo "--with-sysroot=/target-%{_arch}") \

     --disable-static \

     --without-python

 make %{?_smp_mflags}

@@ -62,6 +60,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man3/*

 %changelog

+*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 1.1.32-2

+-   Cross compilation support

 *   Wed Sep 12 2018 Keerthana K <keerthanak@vmware.com> 1.1.32-1

 -   Update to version 1.1.32.

 *   Tue Jul 11 2017 Divya Thaluru <dthaluru@vmware.com> 1.1.29-4

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

 Summary:	OpenLdap-2.4.43

 Name:		openldap

 Version:	2.4.46

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	OpenLDAP

 URL:		http://cyrusimap.web.cmu.edu/

 Group:		System Environment/Security

@@ -40,11 +40,15 @@ sed -i '/6.0.20/ a\\t__db_version_compat' configure

 export CPPFLAGS="-D_REENTRANT -DLDAP_CONNECTIONLESS -D_GNU_SOURCE -D_AVL_H"

 %configure \

-        --disable-static    \

-        --disable-debug     \

-        --disable-slapd     \

-        --with-tls=openssl

+    $(test %{_host} != %{_build} && echo "CC=%{_host}-gcc --with-yielding-select=yes --with-sysroot=/target-%{_arch}") \

+    --disable-static    \

+    --disable-debug     \

+    --disable-slapd     \

+    --with-tls=openssl

+if [ %{_host} != %{_build} ]; then

+ sed -i '/#define NEED_MEMCMP_REPLACEMENT 1/d' include/portable.h

+fi

 make depend

 make %{?_smp_mflags}

 %install

@@ -75,6 +79,8 @@ rm -rf %{buildroot}/*

 /etc/openldap/*

 %changelog

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

+-   Cross compilation support

 *   Mon Nov 5 2018 Sriram Nambakam <snambakam@vmware.com> 2.4.46-2

 -   export CPPFLAGS before invoking configure

 *   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 2.4.46-1

@@ -1,8 +1,10 @@

+%define perl_vendorarchdir %(test %{_host} == %{_build} && echo %{perl_vendorarch} || echo %{perl_vendorarch} | sed 's/x86_64-linux-thread-multi/%{_arch}-linux/')

+

 # Got the intial spec from Fedora and modified it

 Summary:        SQLite DBI Driver

 Name:           perl-DBD-SQLite

 Version:        1.62

-Release:        1%{?dist}

+Release:        2%{?dist}

 Group:          Development/Libraries

 License:        (GPL+ or Artistic) and Public Domain

 URL:            http://search.cpan.org/dist/DBD-SQLite/

@@ -27,8 +29,13 @@ libraries.

 %setup -q -n DBD-SQLite-%{version}

 %build

-CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor

-make %{?_smp_mflags} OPTIMIZE="%{optflags}"

+CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor AR=%{_host}-ar CC=%{_host}-gcc LD=%{_host}-gcc OPTIMIZE="%{optflags}"

+if [ %{_host} != %{_build} ]; then

+ln -s /target-%{_arch}%{perl_privlib}/%{_arch}-linux %{perl_privlib}/%{_arch}-linux

+ln -s /target-%{_arch}%{perl_vendorlib}/%{_arch}-linux %{perl_vendorlib}/%{_arch}-linux

+sed -i 's/x86_64-linux-thread-multi/%{_arch}-linux/' Makefile

+fi

+make %{?_smp_mflags}

 %install

 make pure_install DESTDIR=%{buildroot}

@@ -40,11 +47,13 @@ find %{buildroot} -type f \( -name .packlist -o \

 make test

 %files

-%{perl_vendorarch}/auto/*

-%{perl_vendorarch}/DBD/

+%{perl_vendorarchdir}/auto/*

+%{perl_vendorarchdir}/DBD/

 %{_mandir}/man3/*

 %changelog

+*   Wed Jul 03 2019 Alexey Makhalov <amakhalov@vmware.com> 1.62-2

+-   Cross compilation support

 *   Tue Jan 22 2019 Michelle Wang <michellew@vmware.com> 1.62-1

 -   Update to version 1.62.

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

@@ -2,6 +2,8 @@

 # Filter unwanted dependencies

 %global __requires_exclude %{?__requires_exclude|%__requires_exclude|}^perl\\(RPC::\\)

+%define perl_vendorarchdir %(test %{_host} == %{_build} && echo %{perl_vendorarch} || echo %{perl_vendorarch} | sed 's/x86_64-linux-thread-multi/%{_arch}-linux/')

+

 # According to documentation, module using Coro is just:

 # A PROOF-OF-CONCEPT IMPLEMENTATION FOR EXPERIMENTATION.

 # Omit Coro support on bootsrap bacause perl-DBI is pulled in by core

@@ -11,7 +13,7 @@

 Summary:        A database access API for perl

 Name:           perl-DBI

 Version:        1.641

-Release:        1%{?dist}

+Release:        2%{?dist}

 Group:          Development/Libraries

 License:        GPL+ or Artistic

 URL:            http://dbi.perl.org/

@@ -63,8 +65,15 @@ for F in lib/DBI/W32ODBC.pm lib/Win32/DBIODBC.pm; do

 done

 %build

-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"

-make

+perl Makefile.PL INSTALLDIRS=vendor AR=%{_host}-ar CC=%{_host}-gcc LD=%{_host}-gcc OPTIMIZE="%{optflags}"

+if [ %{_host} != %{_build} ]; then

+sed -i 's/x86_64-linux-thread-multi/%{_arch}-linux/' Makefile

+sed -i 's/PERL_ARCHLIBDEP = /PERL_ARCHLIBDEP = \/target-%{_arch}/' Makefile

+sed -i 's/PERL_INC = /PERL_INC = \/target-%{_arch}/' Makefile

+sed -i 's/PERL_INCDEP = /PERL_INCDEP = \/target-%{_arch}/' Makefile

+sed -i 's/-L\/usr\/local\/lib//' Makefile

+fi

+make %{?_smp_mflags}

 %install

 make pure_install DESTDIR=%{buildroot}

@@ -78,14 +87,16 @@ make test

 %files

 %{_bindir}/dbipro*

 %{_bindir}/dbilogstrip

-%{perl_vendorarch}/*.p*

-%{perl_vendorarch}/DBD/

-%{perl_vendorarch}/DBI/

-%{perl_vendorarch}/auto/DBI/

+%{perl_vendorarchdir}/*.p*

+%{perl_vendorarchdir}/DBD/

+%{perl_vendorarchdir}/DBI/

+%{perl_vendorarchdir}/auto/DBI/

 %{_mandir}/man1/*.1*

 %{_mandir}/man3/*.3*

 %changelog

+*   Fri Nov 09 2018 Alexey Makhalov <amakhalov@vmware.com> 1.641-2

+-   Cross compilation support

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

 -   Update to version 1.641

 *   Mon Apr 3 2017 Robert Qi <qij@vmware.com> 1.636-1

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

 Summary:        rcpsvc protocol.x files and headers

 Name:           rpcsvc-proto

 Version:        1.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 Source0:        https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto-1.4.tar.gz

 %define sha1    rpcsvc=01267dbc7d999c4ffdda1f69532e1f8331489b5f

 License:        LGPLv2+

@@ -9,6 +9,7 @@ Group:          System Environment/Libraries

 URL:            https://github.com/thkukuk/rpcsvc-proto

 Vendor:         VMware, Inc.

 Distribution:   Photon

+%define BuildRequiresNative rpcsvc-proto

 %description

 The rpcsvc-proto package contains the rcpsvc protocol.x files and headers,

@@ -27,6 +28,10 @@ This package includes header files and libraries necessary for developing progra

 %setup -q

 %build

+if [ %{_host} != %{_build} ]; then

+  # use native rpcgen

+  sed -i 's#$(top_builddir)/rpcgen/##' rpcsvc/Makefile.am

+fi

 autoreconf -fi

 %configure

 make %{?_smp_mflags}

@@ -42,5 +47,7 @@ make install DESTDIR=%{buildroot}

 %{_includedir}/rpcsvc/*

 %changelog

+* Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 1.4-2

+- Cross compilation support

 * Fri Sep 21 2018 Alexey Makhalov <amakhalov@vmware.com> 1.4-1

 - Initial version

@@ -1,9 +1,11 @@

 Summary:	TCP/IP daemon wrapper package

 Name:		tcp_wrappers

 Version:	7.6

-Release:	5%{?dist}

+Release:	6%{?dist}

 License: 	BSD

 Group: 		System Environment/Networking

+Vendor:		VMware, Inc.

+Distribution: 	Photon

 URL: 		ftp://ftp.porcupine.org/pub/security/index.html

 Source0: 	ftp://ftp.porcupine.org/pub/security/%{name}_%{version}.tar.gz

 %define sha1 tcp_wrappers=61689ec85b80f4ca0560aef3473eccd9e9e80481

@@ -13,7 +15,7 @@ BuildRequires:  libnsl-devel

 Requires:       libnsl

 %description

-The TCP Wrapper package provides daemon wrapper programs that report the name of the client requesting network services and the requested service. 

+The TCP Wrapper package provides daemon wrapper programs that report the name of the client requesting network services and the requested service.

 %package devel

 Summary:	The libraries and header files needed for tcp_wrappers development.

@@ -28,16 +30,16 @@ The libraries and header files needed for tcp_wrappers development.

 %patch0 -p1

 %build

-sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c &&

-sed -i 's/-O2/-O2 -DUSE_GETDOMAIN/g' Makefile &&

-make REAL_DAEMON_DIR=%{_sbindir} STYLE=-DPROCESS_OPTIONS linux

+sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c

+sed -i 's/-O2/-O2 -DUSE_GETDOMAIN/g' Makefile

+make REAL_DAEMON_DIR=%{_sbindir} STYLE=-DPROCESS_OPTIONS CC=%{_host}-gcc linux

 %install

 mkdir -p %{buildroot}%{_libdir}

 mkdir -p %{buildroot}%{_sbindir}

 mkdir -p %{buildroot}%{_mandir}/man{3,5,8}

 mkdir -p %{buildroot}%{_includedir}

-make DESTDIR=%{buildroot} install 

+make DESTDIR=%{buildroot} install

 %post	-p /sbin/ldconfig

 %postun	-p /sbin/ldconfig

@@ -57,6 +59,8 @@ make DESTDIR=%{buildroot} install

 %{_includedir}/*.h

 %changelog

+* Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 7.6-6

+- Cross compilation support

 * Tue Sep 25 2018 Alexey Makhalov <amakhalov@vmware.com> 7.6-5

 - Use libnsl

 * Mon Sep 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 7.6-4