From f103a7f6b5e3370ba34a5f547fb321eacc4fc5a0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 7 May 2021 16:09:40 -0500 Subject: meta-openembedded: subtree update:08c0280b7c..4fe1065655 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alexander Kanavin (1): libmicrohttpd: remove the recipe Andreas Müller (4): jack: upgrade 1.19.17 -> 1.19.18 xfce4-settings: upgrade 4.16.0 -> 4.16.1 zsh: reduce priority slightly to avoid conflict with bash mutter/wayland: replace xserver-xorg-xwayland by xwayland in rdep Andrej Kozemcak (1): proftpd: Update to 1.3.7a release Armin Kuster (3): wireguard: update to v1.0.20210219 +1 nostromo: remove recipe packagegroup-meta-webserver: remove nostromo from pkg grp Chen Qi (3): tigervnc: upgrade to 1.11.0 python3-django: upgrade to 2.2.20 tigervnc: fix do_package error when enabling user merge Gianfranco (1): vboxguestdrivers: upgrade 6.1.18 -> 6.1.20 Hongxu Jia (1): debootstrap: explicitly add virtual/fakeroot-native to depends Joe Hershberger (1): strongswan: Make PACKAGECONFIG a default value Justin Standring (1): tslib: add PACKAGECONFIG for evthres, one-wire-ts-input Kai Kang (1): freeradius: check existence of openssl's commands in bootstrap Khem Raj (36): nss: Re-enable -Werror gimp: Disable vector icon generation on mips/glibc too iwd: Upgade to 1.13 python3-icu: Upgrade to 2.7.2 nodejs: Update to 14.16.1 nodejs: Fix build with icu-69 nodejs: Use qemu usermode to run target binaries during build nodejs: Fix build on mips nodejs: Fix build with clang for x86 target tbb: Re-introduce PE bearssl: Update to tip of master gimp: Disable vector icons on musl/x86 gd: Replace deprecated types from tiff nodejs: Enable snapshot python3-docutils: Delete libchamplain: Require opengl distro feature aom: Match the name for AOM-Patent-License-1.0 libdevmapper,lvm2: Do not inherit license gnome-disk-utility: Require polkit in distro features README: Make git send-email example work sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES packagegroup-gnome-apps: Add gnome-disk-utility only if polkit is in DISTRO_FEATURES python3-jinja2_2.%.bbappend: Delete python3-pyyaml: Do not check for meta-python python3-pyyaml: Delete python3-markupsafe: Delete bbappend snort,proftpd,net-snmp: Deal with -ffile-prefix-map as well apache2: Deal with -ffile-prefix-map vk-gl-cts: Fix build with GCC 11 gegl: Update to 0.4.30 python3-m2crypto: Upgrade to 0.37.1 libupnp: Upgrade to 1.14.6 ctags: Switch to universal ctags dibbler: Add libpthread to linker flags libowfat: Replace __pure__ with pure and remove using __deprecated__ emacs: Do not use SIGSTKSZ Leon Anavi (21): python3-bitarray: Upgrade 1.9.2 -> 2.0.0 python3-xxhash: Upgrade 2.0.0 -> 2.0.2 python3-xlsxwriter: Upgrade 1.3.8 -> 1.3.9 python3-docutils: Upgrade 0.17 -> 0.17.1 python3-portion: Upgrade 2.1.5 -> 2.1.6 python3-huey: Upgrade 2.3.1 -> 2.3.2 python3-pysonos: Upgrade 0.0.42 -> 0.0.43 python3-asttokens: Upgrade 2.0.4 -> 2.0.5 python3-hyperframe: Upgrade 6.0.0 -> 6.0.1 python3-argcomplete: Upgrade 1.12.2 -> 1.12.3 python3-python-vlc: Upgrade 3.0.12117 -> 3.0.12118 python3-bitarray: Upgrade 2.0.0 -> 2.0.1 python3-sqlalchemy: Upgrade 1.4.7 -> 1.4.11 python3-watchdog: Upgrade 2.0.2 -> 2.0.3 python3-pytest-asyncio: Upgrade 0.14.0 -> 0.15.1 python3-xlsxwriter: Upgrade 1.3.9 -> 1.4.0 python3-astroid: Upgrade 2.5.3 -> 2.5.6 python3-arpeggio: Upgrade 1.10.1 -> 1.10.2 python3-cachetools: Upgrade 4.2.1 -> 4.2.2 python3-pymisp: Upgrade 2.4.141.1 -> 2.4.142 python3-et-xmlfile: Upgrade 1.0.1 -> 1.1.0 Mingli Yu (4): python3-cryptography: Upgrade to 3.3.2 onig: add oniguruma to PROVIDES php: Upgrade to 7.4.16 tk: adapt to potential pseudo changes Persian Prince (1): libdvdnav 6.1.1 Peter Kjellerstedt (1): syslog-ng: Merge .bb and .inc Ramon Fried (1): bitwise: Upgrade 0.41 -> 0.42 Reto Schneider (1): nng: Upgrade 1.2.5 -> 1.4.0 Saul Wold (2): tbb: Disable PPC as COMPATIBLE_MACHINE packagegroup-meta-oe: conditional remove tbb for powerpc Silcet (2): ufw: fix python shebang ufw: bump version to 0.36 and add services Sinan Kaya (1): zram: add support for mem_limit Stefan Ghinea (1): python3-django: fix CVE-2021-28658 Ulrich Ölmann (1): v4l-utils: fix reproducibility Yi Fan Yu (3): syslog-ng: upgrade 3.24.1 -> 3.31.2 syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD syslog-ng: Drop an obsolete patch to add --enable-libnet Yi Zhao (1): gvfs: rdepend on gsettings-desktop-schemas zangrc (19): fuse3: upgrade 3.10.2 -> 3.10.3 cifs-utils: upgrade 6.12 -> 6.13 dnsmasq: upgrade 2.84 -> 2.85 nbdkit: upgrade 1.25.5 -> 1.25.6 wolfssl: upgrade 4.7.0 -> 4.7.1 networkmanager: upgrade 1.30.2 -> 1.30.4 libdvdread: upgrade 6.1.1 -> 6.1.2 libwebsockets: upgrade 4.1.6 -> 4.2.0 ostree: upgrade 2021.1 -> 2021.2 redis: upgrade 6.2.1 -> 6.2.2 tinyproxy: upgrade 1.10.0 -> 1.11.0 nss: upgrade 3.63 -> 3.64 babeld: upgrade 1.9.2 -> 1.10 fetchmail: upgrade 6.4.18 -> 6.4.19 openvpn: upgrade 2.5.1 -> 2.5.2 wireshark: upgrade 3.4.4 -> 3.4.5 debootstrap: upgrade 1.0.123 -> 1.0.124 mailcap: upgrade 2.1.52 -> 2.1.53 rsyslog: upgrade 8.2102.0 -> 8.2104.0 zhengruoqin (7): irssi: upgrade 1.2.2 -> 1.2.3 librsync: upgrade 2.3.1 -> 2.3.2 hiawatha: upgrade 10.11 -> 10.12 python3-supervisor: upgrade 4.2.1 -> 4.2.2 python3-zopeinterface: upgrade 5.3.0 -> 5.4.0 sdparm: upgrade 1.11 -> 1.12 tcsh: upgrade 6.22.03 -> 6.22.04 Signed-off-by: Andrew Geissler Change-Id: Iaeb2fe4ee0a49cf44ea60bc3c1aef83528d92f55 --- ...y-link-in-sysroot-not-in-host-directories.patch | 35 ---------------------- .../python-m2crypto/cross-compile-platform.patch | 33 -------------------- .../m2crypto-0.26.4-gcc_macros.patch | 35 ---------------------- 3 files changed, 103 deletions(-) delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch deleted file mode 100644 index b339d93f7..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 29 Mar 2013 15:17:17 +0100 -Subject: [PATCH] setup.py: link in sysroot, not in host directories - -Signed-off-by: Koen Kooi - -Upstream-status: Unknown ---- - setup.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: M2Crypto-0.30.1/setup.py -=================================================================== ---- M2Crypto-0.30.1.orig/setup.py -+++ M2Crypto-0.30.1/setup.py -@@ -130,6 +130,7 @@ class _M2CryptoBuildExt(build_ext.build_ - self.set_undefined_options('build', ('bundledlls', 'bundledlls')) - - self.libraries = ['ssl', 'crypto'] -+ self.openssl = os.environ.get( "STAGING_DIR" ) - if sys.platform == 'win32': - self.libraries = ['ssleay32', 'libeay32'] - if self.openssl and openssl_version(self.openssl, 0x10100000, True): -@@ -150,8 +151,8 @@ class _M2CryptoBuildExt(build_ext.build_ - - if self.openssl is not None: - log.debug('self.openssl = %s', self.openssl) -- openssl_library_dir = os.path.join(self.openssl, 'lib') -- openssl_include_dir = os.path.join(self.openssl, 'include') -+ openssl_library_dir = os.environ.get( "STAGING_LIBDIR" ) -+ openssl_include_dir = os.environ.get( "STAGING_INCDIR" ) - - self.library_dirs.append(openssl_library_dir) - self.include_dirs.append(openssl_include_dir) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch deleted file mode 100644 index 4b64f4613..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch +++ /dev/null @@ -1,33 +0,0 @@ -Do not compute platform, this does not work in cross compile environment -since it pokes at the system for getting architecture values - -Upstream-Status: Inappropriate -Signed-off-by: Khem Raj - -Index: M2Crypto-0.30.1/setup.py -=================================================================== ---- M2Crypto-0.30.1.orig/setup.py -+++ M2Crypto-0.30.1/setup.py -@@ -160,22 +160,6 @@ class _M2CryptoBuildExt(build_ext.build_ - log.debug('self.include_dirs = %s', self.include_dirs) - log.debug('self.library_dirs = %s', self.library_dirs) - -- if platform.system() == "Linux": -- # For RedHat-based distros, the '-D__{arch}__' option for -- # Swig needs to be normalized, particularly on i386. -- mach = platform.machine().lower() -- if mach in ('i386', 'i486', 'i586', 'i686'): -- arch = '__i386__' -- elif mach in ('ppc64', 'powerpc64', 'ppc64le', 'ppc64el'): -- arch = '__powerpc64__' -- elif mach in ('ppc', 'powerpc'): -- arch = '__powerpc__' -- else: -- arch = '__%s__' % mach -- self.swig_opts.append('-D%s' % arch) -- if mach in ('ppc64le', 'ppc64el'): -- self.swig_opts.append('-D_CALL_ELF=2') -- - self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) - - # Some Linux distributor has added the following line in diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch deleted file mode 100644 index 7f6dd29f8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch +++ /dev/null @@ -1,35 +0,0 @@ -Imported from Fedora - -Index: M2Crypto-0.30.1/SWIG/_m2crypto.i -=================================================================== ---- M2Crypto-0.30.1.orig/SWIG/_m2crypto.i -+++ M2Crypto-0.30.1/SWIG/_m2crypto.i -@@ -8,6 +8,11 @@ - * - */ - -+%import "gcc_macros.h" -+ -+%ignore WCHAR_MAX; -+%ignore WCHAR_MIN; -+ - %module(threads=1) m2crypto - /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere. - Disable threadallow as well, only enable it for operations likely to -@@ -15,11 +20,6 @@ - %nothreadblock; - %nothreadallow; - --#if SWIG_VERSION >= 0x030000 --#define __WCHAR_MAX__ __WCHAR_MAX --#define __WCHAR_MIN__ __WCHAR_MIN --#endif -- - %{ - #ifdef _WIN32 - #define _WINSOCKAPI_ -@@ -95,4 +95,3 @@ static PyObject *x509_store_verify_cb_fu - %constant int encrypt = 1; - %constant int decrypt = 0; - #endif -- -- cgit v1.2.3