From 5d8d4fbbcb5c5de9370711c19bb3510210989a98 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Sat, 20 Feb 2021 16:02:15 -0800 Subject: [PATCH] treewide: Run refresh on all packages The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy --- admin/backuppc/patches/001-debian-fixes.patch | 42 ++++---- admin/gkrellmd/patches/100-conf.patch | 10 +- ....1-compatibility-error-storage-size-.patch | 21 ++-- ...iler-happier-about-changes-related-t.patch | 9 +- ...ool-coredumps-in-EVP_CIPHER_CTX_init.patch | 9 +- ...CIPHER_CTX_free-instead-of-EVP_CIPHE.patch | 21 ++-- ...ompile-with-deprecated-APIs-disabled.patch | 9 +- ...-Fix-buffer-overflow-vulnerabilities.patch | 19 ++-- ...uffer-overflow-in-ipmi_spd_print_fru.patch | 9 +- ...er-overflow-in-ipmi_get_session_info.patch | 9 +- ...020-5208-channel-Fix-buffer-overflow.patch | 7 +- ...er-overflows-in-get_lan_param_select.patch | 19 ++-- ...u-sdr-Fix-id_string-buffer-overflows.patch | 19 ++-- admin/ipmitool/patches/0012-gcc10.patch | 6 +- .../patches/010-daemon-makefile-ldflags.patch | 2 - admin/schroot/patches/01-openwrt.patch | 56 +++++------ .../patches/010-cross-compile-fixes.patch | 2 +- admin/sudo/patches/020-no-owner-change.patch | 2 +- ...t-choke-when-building-32bit-on-64bit.patch | 2 +- .../020-disable-check-for-sys-sdt-h.patch | 20 ++-- .../gcc/patches/260-musl-add-unwind-fix.patch | 2 +- ...ibffi-fix-MIPS-softfloat-build-issue.patch | 7 -- ...mpilation-when-making-cross-compiler.patch | 9 +- .../patches/970-replace-memcpy-memset.patch | 18 ++-- .../patches/100-fix-reproducible-builds.patch | 8 +- devel/lpc21isp/patches/110-bzero.patch | 2 +- devel/lpc21isp/patches/120-nanosleep.patch | 2 +- devel/patch/patches/010-CVE-2018-6951.patch | 7 +- .../patch/patches/020-CVE-2018-1000156.patch | 16 +-- devel/patch/patches/030-CVE-2018-6952.patch | 5 - devel/patch/patches/050-CVE-2019-13636.patch | 15 +-- .../060-CVE-2018-20969-CVE-2019-13638.patch | 9 +- ipv6/tayga/patches/003-RFC8215.patch | 7 +- .../0001-file.c-Patch-for-Linux-v5.8.patch | 11 +-- ...lfile.c-compatibility-with-linux-5.6.patch | 9 +- .../patches/010-openssl-deprecated.patch | 8 +- ...ulator-reorder-inclued-headers-paths.patch | 6 +- lang/lua-coxpcall/patches/config.patch | 4 +- lang/lua-md5/patches/config.patch | 4 +- lang/lua-md5/patches/makefile.patch | 4 +- .../patches/0001-Revise-Makefile.patch | 18 ++-- lang/lua-rings/patches/config.patch | 6 +- lang/lua-rings/patches/makefile.patch | 4 +- .../patches/100-remove-build-timestamps.patch | 2 +- lang/lualanes/patches/100-musl-compat.patch | 2 +- .../102-disable-compat-deprecated.patch | 2 - lang/luaposix/patches/900-disable-ldoc.patch | 2 - .../patches/01_dont_modify_bin_shebang.diff | 8 +- ...onfigure_uname_siteconfig_adjustment.patch | 6 +- lang/luasec/patches/100-fix-compilation.patch | 4 +- .../patches/0001-Add-interface-support.patch | 15 --- .../patches/0301-Fix-mpc85xx-build.patch | 2 +- .../100-remove-devel-checklib-checks.patch | 9 +- .../patches/100-fix_buildsystem.patch | 2 +- .../110-just_assume_libusb_is_there.patch | 8 +- .../140-avoid-libusb-name-conflicts.patch | 8 +- .../patches/001-no-subdirs.patch | 6 +- .../patches/101-skip-preprocessor-symbol.path | 5 - .../patches/210-curl_7.66_compat.patch | 12 +-- .../patches/220-curl_7.69_compat.patch | 2 +- .../patches/010-libevent2.patch | 4 +- ...-use-of-the-system-timezone-database.patch | 16 ++- .../patches/0032-Use-system-timezone.patch | 4 +- ...ove-build-timestamps-from-generated-.patch | 10 +- ...ation-icon-to-not-expose-the-reader-.patch | 2 - .../0050-remove-build-timestamps.patch | 4 +- ...xt-opcache-fix-detection-of-shm-mmap.patch | 5 - .../patches/1004-disable-phar-command.patch | 12 +-- ...-use-of-the-system-timezone-database.patch | 16 ++- .../patches/0022-Use-system-timezone.patch | 4 +- .../patches/0025-php-5.4.9-fixheader.patch | 4 +- ...ation-icon-to-not-expose-the-reader-.patch | 2 - ...ove-build-timestamps-from-generated-.patch | 6 +- .../patches/1004-disable-phar-command.patch | 2 +- ...10-Fix-opcache-jit-minilua-compiling.patch | 5 - .../patches/000-Makefile-no-errors.patch | 2 - .../patches/001-backport-ffi-fix.patch | 12 +-- .../patches/001-fix-libgmp-loading.patch | 2 +- .../patches/002-omit-tests.patch | 2 +- .../patches/001-fix-libgmp-loading.patch | 2 +- .../patches/002-omit-tests.patch | 2 +- ...ompatibility-issue-with-array-module.patch | 5 - ...1-always-compile-scalar-mult-ed25519.patch | 2 - .../patches/010-setup-py-custom-cc.patch | 7 +- ...ables-when-defining-libdir-and-inclu.patch | 5 - .../003-do-not-run-distutils-tests.patch | 4 +- .../004-do-not-write-bytes-codes.patch | 2 +- ...multiarch-paths-when-cross-compiling.patch | 2 +- ...add-rt-lib-dirs-when-cross-compiling.patch | 2 +- .../014-remove-platform-so-suffix.patch | 4 +- .../patches/015-abort-on-failed-modules.patch | 2 +- .../patches/016-adjust-config-paths.patch | 8 +- .../patches/024-musl-find_library.patch | 6 +- lang/ruby/patches/100-musl.patch | 2 +- .../patches/002-fix-gdbm-error-handling.patch | 4 +- libs/avahi/patches/010-pkgconfig.patch | 28 ------ .../100-p2p-no-iff_multicast-required.patch | 10 +- libs/flac/patches/010-utime.patch | 11 +-- .../patches/020-openssl-no-dynamic.patch | 2 +- .../getdns-1.6.0-fix-crosscompile.patch | 6 +- libs/h2o/patches/100-socket_disable_npn.patch | 4 +- .../200-libh2o-evloop_wslay-link.patch | 8 +- .../h2o/patches/400-backtrace-detection.patch | 8 +- libs/h2o/patches/500-openssl.patch | 12 +-- libs/h2o/patches/600-engine.patch | 4 +- .../patches/001-fix-build-with-musl.patch | 2 - .../patches/010-build-with-openssl-1.1.patch | 22 +---- ...10-Add-operator-to-Bundle-block_elem.patch | 2 - ...or-in-const-function-of-MemoryBundle.patch | 2 - ...d-streamoff-instead-of-std-streampos.patch | 4 - ...-operator-to-BundleID-and-MetaBundle.patch | 4 - .../patches/001-add-srv-addr.patch | 66 ++++++------- .../010-fix_minor_leak_upstream_198f720.patch | 2 - .../jose/patches/020-openssl-deprecated.patch | 2 +- .../ldns/patches/001-compile-for-darwin.patch | 2 +- .../ldns/patches/010-openssl-deprecated.patch | 8 +- libs/ldns/patches/020-openssl-dsa.patch | 49 +++------- libs/ldns/patches/030-signzone.patch | 2 +- libs/libaio/patches/004_arches_x32.patch | 3 +- libs/libcap/patches/300-disable-tests.patch | 4 +- libs/libcgroup/patches/010-cdefs.patch | 12 +-- .../patches/001-daemon_set_verbosity.patch | 7 +- libs/libdaq/patches/001-compile.patch | 7 +- libs/libdaq/patches/100-musl-compat.patch | 15 ++- ...move-date-to-fix-reproducible-builds.patch | 80 ++++++--------- .../patches/001-disable_pixbuf.patch | 7 +- libs/libesmtp/patches/100-openssl-1.1.patch | 6 +- .../200-add-TLSv1_1-TLSv1_2-support.patch | 2 +- ...s-fix-compilation-with-older-kernels.patch | 7 -- .../libevhtp/patches/010-openssl-thread.patch | 4 +- libs/libexif/patches/100-no_doc.patch | 7 +- .../patches/100-fix_mips_softfloat.patch | 2 - libs/libffi/patches/200-ppc.patch | 2 - .../patches/100-fix-x86_64-build.patch | 2 +- libs/libgabe/patches/010-shared-library.patch | 7 +- libs/libgd/patches/010-getlib.patch | 6 -- .../patches/000-fix_darwin_error.patch | 6 +- libs/libimobiledevice/patches/120-iOS14.patch | 10 +- libs/liblo/patches/010-index.patch | 2 +- libs/liblo/patches/020-usleep.patch | 4 +- .../001-mips_removal_h_constraint.patch | 18 ++-- .../101-CVE-2017-8374-length-check.patch | 26 ++--- ...-CVE-2017-8373-CVE-2017-8372-md-size.patch | 10 +- ...T_-macros-in-case-of-negative-values.patch | 7 +- .../patches/102-arm_data_preload_check.patch | 5 +- libs/libmraa/patches/020-support_v12.patch | 2 +- ...ecessary-pkgconfig-config.status-dep.patch | 5 - ...d-remove-unused-lines-in-Makefile.am.patch | 5 - ...build-resolve-automake-1.12-warnings.patch | 5 - ...e-needed-for-integer-type-definition.patch | 5 - ...0005-configure-uclinux-is-also-linux.patch | 5 - ...thout-ipulog-option-to-disable-libip.patch | 11 --- ...ude-Sync-with-current-kernel-headers.patch | 5 - ...ude-Sync-with-current-kernel-headers.patch | 5 - .../0002-src-fix-IPv6-header-handling.patch | 4 +- .../patches/010-openssl-deprecated.patch | 14 +-- libs/libowfat/patches/001-fixbuild.patch | 2 +- libs/libp11/patches/001-fix-install.patch | 6 +- ...l-pf_ring.c-linux-v5.9-compatibility.patch | 64 ++++++------ libs/libre2/patches/010-cxx17.patch | 2 +- .../libtheora/patches/001-no_docs_tests.patch | 16 ++- libs/libtheora/patches/002-no_sdl_check.patch | 6 +- libs/libtorrent/patches/010-usleep.patch | 4 +- libs/libupm/patches/001-version.patch | 4 +- libs/libupm/patches/002-at42qt1070-id.patch | 2 +- libs/libupm/patches/004-uint8_t.patch | 21 ++-- libs/libuwsc/patches/001-fix_find_lua.patch | 4 +- .../patches/010-remove-libudev-check.patch | 2 +- libs/libwslay/patches/100-disable-doc.patch | 8 +- .../001-fix-x32-build-by-disabling-asm.patch | 4 +- ...-dont-default-to-cortex-a9-with-neon.patch | 2 +- libs/libxml2/patches/001-CVE-2019-20388.patch | 7 +- libs/libxml2/patches/002-CVE-2020-24977.patch | 5 - libs/libxml2/patches/003-CVE-2020-7595.patch | 7 +- libs/libyaml-cpp/patches/010-libcxx.patch | 2 - libs/lmdb/patches/010-fix-makefile.patch | 10 +- .../patches/001-allow-disable-libidn.patch | 2 - .../patches/002-fix-comparison.patch | 7 +- libs/loudmouth/patches/010-add-private.patch | 48 ++++----- .../900-disable-docs-examples-tests.patch | 2 +- libs/minizip/patches/010-disable-libbsd.patch | 13 +-- .../patches/python_memory_allocation.patch | 4 +- ...le.in_rm_BUILD_STRING_and_BUILD_TIME.patch | 13 +-- .../patches/002-native_and_musl_fix.patch | 12 +-- libs/p11-kit/patches/010-stdint.patch | 2 - ...4-pixman-fix-detection-of-mips-dspr2.patch | 4 +- libs/pthsem/patches/001-linux3x-fix.patch | 7 +- libs/pthsem/patches/002-fix-signal.h | 10 +- libs/pthsem/patches/003-linux4x-fix.patch | 6 +- .../patches/001-respect-cflags-ldflags.patch | 2 +- libs/spice/patches/010-librt-libm.patch | 4 +- .../patches/020-no-code-generation.patch | 43 +++----- .../patches/030-include-generated-code.patch | 26 +++-- libs/spice/patches/040-only-server.patch | 4 +- libs/spice/patches/050-no-mkenums.patch | 2 - .../100-Remove_libbsd_dependency_check.patch | 8 +- libs/tinycdb/patches/100-Makefile.patch | 7 +- libs/udns/patches/0001-use-autotools.patch | 8 +- .../patches/001-fix_Makefiles_and_shlib.patch | 32 +++--- libs/uw-imap/patches/002-imap-2004a-doc.patch | 12 +-- .../patches/003-imap-2007e-overflow.patch | 5 +- .../patches/005-imap-2007e-authmd5.patch | 5 +- .../006-imap-2007f-format-security.patch | 7 +- .../uw-imap/patches/007-imap-2007e-poll.patch | 24 ++--- .../patches/010-imap-2007f-openssl-1.1.patch | 13 +-- .../patches/020-deprecated-openssl.patch | 2 - libs/xmlrpc-c/patches/010-nanosleep.patch | 2 +- .../100-link-reformatter-uclibc-libm.patch | 6 +- .../patches/101-link-perf-uclibc-libm.patch | 2 +- mail/dovecot/patches/001-configure_in.patch | 4 +- .../patches/100-openssl-deprecated.patch | 4 +- mail/dovecot/patches/110-openssl-engine.patch | 4 +- mail/emailrelay/patches/010-openssl-1.1.patch | 2 +- .../020-Fix-compile-with-OpenSSL-1.1.0.patch | 5 - mail/fdm/patches/030-cdefs.patch | 4 +- .../100-ignore_cross_compile_test.patch | 6 +- ...001-OpenSSL-1.1-support-for-HMAC-api.patch | 6 +- ...oved-API-deprecated-by-OpenSSL-1.1.0.patch | 9 +- mail/nail/patches/010-remove-gssapi.patch | 10 +- .../nail/patches/300-openssl-deprecated.patch | 2 +- mail/opendkim/patches/020-uclibc.patch | 2 +- .../patches/010-enable-nonroot-install.patch | 6 +- .../patches/011-libmilter-so-version.patch | 6 +- .../patches/102-pthreads-stack-size.patch | 12 +-- multimedia/ffmpeg/patches/010-pkgconfig.patch | 2 +- multimedia/ffmpeg/patches/030-h264-mips.patch | 2 +- multimedia/ffmpeg/patches/050-glibc.patch | 4 +- .../patches/001-no-help-po-tests.patch | 7 +- .../gst1-libav/patches/010-distutils.patch | 6 +- .../patches/010-distutils.patch | 2 +- .../patches/010-distutils.patch | 2 +- .../patches/010-distutils.patch | 2 +- .../patches/010-distutils.patch | 2 +- ...10-gstplugin-use-lazy-symbol-binding.patch | 2 +- .../gstreamer1/patches/020-distutils.patch | 2 +- .../patches/001-icecast-2.4.0-tremor.patch | 10 +- .../patches/005-no_examples_doc_win32.patch | 2 +- .../patches/010-fix_libcurl_test_crap.patch | 2 +- .../010-optional-plugins-selection.patch | 3 +- .../020-remove-auto-lib-selection.patch | 4 +- .../tvheadend/patches/020-strncpy-issue.patch | 2 - multimedia/tvheadend/patches/030-gcc10.patch | 2 +- .../xupnpd/patches/100-default_config.patch | 4 +- .../patches/500-cross_compile_flags.patch | 2 +- .../patches/020-openssl-deprecated.patch | 14 +-- net/apcupsd/patches/010-fix-usb.patch | 4 +- net/apcupsd/patches/015-drop-doc.patch | 8 +- net/beanstalkd/patches/900-makefile.patch | 6 +- net/beanstalkd/patches/901-fix-headers.patch | 4 +- .../patches/902-replace-posix_fallocate.patch | 2 +- net/boinc/patches/001-avoidExtraDependencies | 6 +- net/boinc/patches/002-hosttypeRespected | 6 +- ...-Use-static-inline-instead-of-inline.patch | 38 +++---- .../0001-OpenSSL-1.1.0-compile-fix.patch | 16 ++- .../patches/010-openssl-deprecated.patch | 2 +- net/conserver/patches/001-remove-strip.patch | 28 +++--- net/coova-chilli/patches/200-wolfssl.patch | 4 +- net/coova-chilli/patches/300-sysinfo.patch | 2 - .../101-allow-multiple-local-interfaces.patch | 4 +- net/davfs2/patches/010-main_code_fix.patch | 2 +- net/davfs2/patches/030-realpath.patch | 8 +- net/davfs2/patches/050-sys-types.patch | 2 +- .../patches/01_add_uci_config_provider.patch | 4 +- net/dnscrypt-proxy/patches/010-internal.patch | 2 +- net/eoip/patches/100-add_LF_to_pidfile.patch | 6 +- .../patches/110-format_security_fix.patch | 5 +- net/etherwake/patches/120-musl-compat.patch | 2 +- .../patches/100-plugin-export-dir.patch | 6 +- net/foolsm/patches/110-missing-WAIT_ANY.patch | 6 +- ...-disable-session-cache-CVE-2017-9148.patch | 4 +- ...04-get-hostname-from-proc-in-radtest.patch | 1 - .../patches/010-openssl-deprecated.patch | 14 +-- net/frr/patches/098-fix_mips_libyang.patch | 2 +- .../100-configure_for_crosscompiling.patch | 6 +- .../patches/200-imapsend_without_curl.patch | 2 +- ...310-fix-uname-detection-for-crosscompiling | 9 +- .../patches/0100-avoid-ssh-keygen.patch | 8 +- .../patches/0001-reproducible-builds.patch | 12 +-- ...-ibrdtnd-added-openssl-compatibility.patch | 13 --- ...4-bits-counters-and-fix-gcc-warnings.patch | 42 +++----- net/iftop/patches/010-gcc10.patch | 4 - net/iodine/patches/010-cross-compile.patch | 4 +- .../patches/100-musl-compatibility.patch | 2 - ...SSL-when-1.1-with-deprecated-APIs-di.patch | 7 +- .../patches/520-bind-no-catgets.patch | 2 +- net/kismet/patches/030-libcxx.patch | 6 +- net/knot/patches/01_zscanner_tests.patch | 2 - net/knot/patches/02_knot.conf.patch | 6 +- net/knxd/patches/0099-openwrt.patch | 6 +- net/knxd/patches/0100-version.patch | 6 +- net/knxd/patches/020-cdefs.patch | 2 +- ...001-fix-uninitialized-warning-errors.patch | 12 +-- net/libreswan/patches/010-nanosleep.patch | 8 +- net/libreswan/patches/020-limits.patch | 4 +- .../patches/030-fix_musl_build.patch | 4 +- net/libreswan/patches/040-disable_man.patch | 6 +- net/lighttpd/patches/010-meson-lua.patch | 7 +- net/lighttpd/patches/020-meson-zstd.patch | 5 - net/linknx/patches/010-cdefs.patch | 2 +- ...x-netinet-sctp.h-not-to-be-installed.patch | 5 - .../patches/0001-add-cmake-support.patch | 36 ------- ...ssing-for-SPI_DEV_PATH-and-SPI_SPEED.patch | 5 - ...-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch | 9 +- net/miniupnpc/patches/100-no-fPIC.patch | 2 +- .../patches/200-remove-default-cflags.patch | 2 +- net/miniupnpd/patches/300-macos-compat.patch | 4 +- .../patches/301-ext_ip_reserved_ignore.patch | 18 +--- net/mstpd/patches/010-bsd.patch | 2 +- .../patches/110-debian-makefiles.patch | 21 ++-- net/net-snmp/patches/170-ldflags.patch | 2 +- net/net-snmp/patches/910-signal.patch | 8 +- net/netatalk/patches/010-gcc10.patch | 2 - .../patches/001-netcat_flag_count.patch | 10 +- net/netdiscover/patches/010-gcc10.patch | 2 +- ...1-configure-script-honors-C-LD-FLAGS.patch | 5 - ...2-fix-ncurses-check-during-configure.patch | 5 - ...flowtop-pkg-config-usage-for-ncurses.patch | 5 - net/nginx/patches/104-endianness_fix.patch | 2 - .../patches/201-ignore-invalid-options.patch | 2 +- ...namespace-std-causing-name-conflicts.patch | 16 +-- .../patches/020-Python3-port-of-ndiff.patch | 44 +++------ net/ntpclient/patches/200-time.patch | 4 +- net/oor/patches/010-gcc10.patch | 2 +- net/open-isns/patches/01-security_mode.patch | 22 +---- .../patches/02-fix_signed_vs_unsigned.patch | 6 +- net/open-isns/patches/03-include_poll_h.patch | 2 - net/open-isns/patches/04-ignore_write.patch | 6 +- net/open-isns/patches/20-signals.patch | 2 - ...-interface-flag-survive-internal-por.patch | 4 +- ...host-target-python-for-cross-compile.patch | 4 - .../0003-ovs-lib-fix-install_dir.patch | 2 - .../patches/0004-build-trim-build.patch | 2 - ...assing-additional-OVS_KERNEL_MAKE_FL.patch | 2 - ...libopenvswitch-with-libunwind-libunb.patch | 6 -- ...ild-skip-check-and-use-of-libunbound.patch | 2 - .../0002-build-skip-tests-and-docs.patch | 6 +- .../0003-ovn-lib-fix-install_dir.patch | 2 - .../100-pdns-disable-pdns.conf-dist.patch | 4 +- net/pen/patches/010-deprecated-openssl.patch | 9 +- net/port-mirroring/patches/020-time.patch | 4 +- ...-Run-as-user-group-radicale-radicale.patch | 7 +- .../110-disable-setup_requirements.patch | 6 +- .../patches/200-logdest-on-foreground.patch | 2 +- net/radsecproxy/patches/300-gcc10.patch | 4 - ...0001-Disable-non-IANA-TLS-extensions.patch | 7 +- ...-compilation-without-deprecated-APIs.patch | 15 +-- .../0006-fix_default_config_location.patch | 2 +- net/rtorrent/patches/130-usleep.patch | 4 +- net/samba4/patches/001-samba-4.4.0-pam.patch | 4 +- net/samba4/patches/003-getpwent_r.patch | 20 ++-- net/samba4/patches/004-missing-headers.patch | 6 -- net/samba4/patches/005-musl_uintptr.patch | 6 +- net/samba4/patches/006-netdb-defines.patch | 4 +- ...bldb-fix-musl-libc-unkown-type-error.patch | 5 - ...mba-4-11-fix-host-tools-checks.patch.patch | 8 +- ...-fix-musl_missing__nss_buflen_passwd.patch | 4 +- .../020-source3-msgsock-nvram-fix.patch | 4 +- .../021-source4-msgsock-nvram-fix.patch | 2 +- .../101-do-not-check-xsltproc-manpages.patch | 10 +- .../102-samba-4.11-unbundle-libbsd.patch | 15 ++- .../103-samba-4.12-unbundle-libunwind.patch | 4 +- .../patches/104-samba-4.12-unbundle-icu.patch | 4 +- .../patches/110-lib.common.patch | 10 +- .../patches/010-install_cp.patch | 8 +- net/shorewall-lite/patches/020-set-PATH.patch | 6 +- net/shorewall-lite/patches/120-logfile.patch | 8 +- net/shorewall/patches/130-set-path.patch | 8 +- .../patches/010-install_cp.patch | 8 +- .../patches/020-set-PATH.patch | 6 +- net/shorewall6-lite/patches/120-logfile.patch | 8 +- net/shorewall6/patches/120-logfile.patch | 10 +- net/shorewall6/patches/130-set-path.patch | 8 +- net/snort/patches/001-compile.patch | 23 +++-- net/snort/patches/003-include-tirpc.patch | 5 +- net/socat/patches/100-usleep.patch | 2 +- .../patches/200-openssl-deprecated.patch | 2 - net/softethervpn/patches/110-no-m64.patch | 2 +- .../patches/120-openssl-deprecated.patch | 10 +- net/softethervpn/patches/130-iconv.patch | 6 +- .../patches/001-iconv-defines-fix.patch | 6 +- .../patches/002-iconv-cmake-fix.patch | 4 +- .../100-increase-cfg-save-intervall.patch | 6 +- .../patches/101-add-config-write-syslog.patch | 8 +- net/softflowd/patches/010-bzero.patch | 22 ++--- net/sslh/patches/001-no_sslh_select.patch | 4 +- .../patches/200-openssl-deprecated.patch | 4 +- .../stubby-0.3.0-fix-config-install.patch | 6 +- ...006-update-generated-protobufc-files.patch | 8 +- .../patches/010-configure-remove-libnsl.patch | 6 +- .../patches/001-ragel_generated.patch | 5 +- ...move-build-timestamps-build-hostname.patch | 18 ++-- net/tinyproxy/patches/120-fix_INET6.patch | 4 +- net/tor/patches/001-torrc.patch | 6 +- net/udptunnel/patches/001-multicast.patch | 6 +- net/udptunnel/patches/002-main_code_fix.patch | 12 +-- net/ulogd/patches/010-json-remote.patch | 19 ++-- net/ulogd/patches/020-fix-musl.patch | 5 - net/ulogd/patches/030-ipfix-add.patch | 25 +---- net/ulogd/patches/040-ipfix-template.patch | 29 ++---- net/unbound/patches/100-example-conf-in.patch | 6 +- .../patches/001-dont-hardcode-zlib.patch | 2 +- ...dont-override-toolchain-optimization.patch | 2 +- ...03-hard-code-Linux-as-compilation-os.patch | 2 +- net/uwsgi/patches/010-uclibc-ng.patch | 2 +- .../020-uwsgiconfig-system-python3.patch | 6 +- ...-plugins-cgi_adds_dontresolve_option.patch | 10 +- .../patches/001-uclibcxx_linking.patch | 4 +- net/vncrepeater/patches/002-cfg-path.patch | 10 +- .../990-adjust-configuration-defaults.patch | 4 +- net/vpnc/patches/110-openssl-deprecated.patch | 2 +- .../patches/010-openssl-deprecated.patch | 7 +- net/wifidog/patches/010-use-tls-above-1.patch | 4 - .../020-Modify-get-ip-from-iface-method.patch | 2 - ...2tpd-control-fix-out-of-bound-access.patch | 2 - ...002-xl2tpd-control-fix-typo-in-usage.patch | 2 - .../patches/0003-Skip-building-pfc.patch | 2 - .../patches/210-freebsd-build-fix.patch | 2 +- sound/espeak/patches/010-uclibcxx.patch | 2 +- .../patches/0001-switch-to-new-alsa-api.patch | 47 +++++---- sound/mpd/patches/010-iconv.patch | 2 - sound/mpd/patches/020-npupnp.patch | 46 +++------ sound/pulseaudio/patches/010-iconv.patch | 2 +- ...heck-for-dns_sd.h-in-case-libdl-was-.patch | 5 - .../010-select_broadcast_interface.patch | 56 +++++------ sound/squeezelite/patches/020-no_libmad.patch | 2 +- .../0002-gitignore-for-autotools-files.patch | 6 -- ...t-text-to-.wav-using-svox-text-to-sp.patch | 12 --- .../svox/patches/0004-add-header-files.patch | 5 - .../patches/0005-Install-lang-files.patch | 5 - sound/svox/patches/0006-Set-picolangdir.patch | 9 +- sound/svox/patches/0008-64bits.patch | 12 +-- sound/svox/patches/0009-Fix-link-order.patch | 10 +- sound/svox/patches/0011-subdir.patch | 7 +- sound/svox/patches/0012-no-headers.patch | 7 +- .../patches/100-no-gettext_configure.patch | 6 +- .../acl/patches/101-no-gettext_autogen.patch | 2 - .../acl/patches/102-no-gettext_Makefile.patch | 2 - .../patches/100-remove-glibc-assumption.patch | 17 ++-- .../patches/100-no-gettext_configure.patch | 4 +- .../attr/patches/101-no-gettext_autogen.patch | 2 - .../patches/102-no-gettext_Makefile.patch | 2 - .../110-Replace-bzero-with-memset.patch | 15 +-- ...tue-functions-for-strndupa-rawmemchr.patch | 19 +--- utils/audit/patches/0002-fix-gcc-10.patch | 5 - .../patches/020-no-cpp-timestamps.patch | 2 +- utils/avrdude/patches/110-ud-to-u.patch | 8 +- utils/bc/patches/001-disable-doc.patch | 10 +- ...01-bcm43xx-Add-bcm43xx-3wire-variant.patch | 6 +- ...-speed-must-be-reset-after-the-firmw.patch | 6 +- ...ncrease-firmware-load-timeout-to-30s.patch | 6 +- ...-the-43xx-firmware-into-lib-firmware.patch | 6 +- utils/bluez/patches/201-readline.patch | 6 +- utils/bluez/patches/202-fix-endianness.patch | 6 +- .../patches/203-obexd_without_systemd.patch | 14 +-- ...fresh_adv_manager_for_non-LE_devices.patch | 6 +- .../bonnie++/patches/010-openwrt-fixes.patch | 4 +- utils/ccrypt/patches/001-no-intl.patch | 20 +--- utils/cmdpad/patches/100-Makefile.patch | 4 +- .../cmdpad/patches/120-kernel26-compat.patch | 6 +- utils/cmdpad/patches/130-no_zombie.patch | 8 +- .../920-backport-netlink-reg-noerror.patch | 4 +- ...930-dhcpleases-add-dhcpleases-plugin.patch | 20 +--- .../patches/001-no_docs_man_tests.patch | 8 +- ...-831-behavior-on-removed-directories.patch | 21 ++-- ...ort-gpio-with-number-bigger-than-255.patch | 13 +-- .../patches/020-libmicrohttpd.patch | 4 +- .../patches/0001_add_missing_includes.patch | 50 +++++----- .../patches/001-libdevmapper_name_fix.patch | 6 +- utils/domoticz/patches/010-boost-173.patch | 98 ------------------- .../patches/011-openzwave-include.patch | 11 --- .../patches/012-minizip-overflow.patch | 5 - utils/dosfstools/patches/010-iconv.patch | 4 +- utils/evtest/patches/010-musl.patch | 5 - ...ld-on-32bit-arches-with-64bit-time_t.patch | 9 +- utils/flashrom/patches/010-bitbang.patch | 4 +- utils/gddrescue/patches/001-fix_uclibc.patch | 2 +- .../patches/100-replace-lua2c-with-sed.patch | 4 +- .../patches/101-adjust-script-size.patch | 6 +- utils/hwinfo/patches/0-hardcoding-version | 6 +- .../patches/100-remove-build-timestamp.patch | 16 ++- utils/lcdproc/patches/110-in-outb.patch | 2 +- .../patches/100-install_delete_fix.patch | 2 +- utils/lvm2/patches/002-const-stdio.patch | 4 +- utils/lvm2/patches/003-no-mallinfo.patch | 6 +- .../patches/0001-fix-build-with-musl.patch | 6 +- utils/mariadb/patches/100-fix_hostname.patch | 2 +- utils/mariadb/patches/130-c11_atomics.patch | 8 +- .../patches/170-ppc-remove-glibc-dep.patch | 12 +-- ...-relax-mysql_install-db-wrt-pam-tool.patch | 6 +- .../190-replace-hostname-in-mysqld_safe.patch | 6 +- utils/mbtools/patches/010-glib.patch | 2 +- ...00-fix-unit-test-server-return-value.patch | 6 +- utils/mc/patches/010-subshell.patch | 2 +- .../patches/001-cross_compile_openwrt.patch | 4 +- utils/minicom/patches/200-gcc10.patch | 4 +- utils/mksh/patches/100-dot_mkshrc | 2 +- ...f-Product-Revision-and-Serial-Number.patch | 7 +- ...Add-various-SD-eMMC-vendors-to-table.patch | 47 ++++----- .../patches/0008-Various-fixes.patch | 57 +++++------ ...ils-let-FFU-mode-use-CMD23-and-CMD25.patch | 7 -- ...her-optimization-of-trimming-routine.patch | 5 - ...-mmc-utils-Fix-scaling-of-cache-size.patch | 7 +- .../patches/002_no-install-strip.patch | 2 +- utils/mpack/patches/001-use-stdlib.patch | 12 +-- utils/mt-st/patches/010-sysmacros.patch | 4 - .../netwhere/patches/010-libmicrohttpd.patch | 2 +- .../patches/001-fix-32-bit-build.patch | 4 - utils/openobex/patches/001-cxx.patch | 2 - .../patches/001-switch_unsigned.patch | 2 +- .../patches/002-disable_yywrap.patch | 14 +-- .../pcsc-tools/patches/001-disable-atr.patch | 4 +- utils/picocom/patches/010-fix-compile.patch | 4 +- .../picocom/patches/020-fix-compile-x86.patch | 5 - utils/picocom/patches/030-usleep.patch | 2 - utils/pigz/patches/001.patch | 4 +- utils/powertop/patches/002-strerror_r.patch | 6 +- ...-src-main-Add-missing-pthread-header.patch | 5 - ...-Change-open-parameter-to-const-char.patch | 7 +- .../procps-ng/patches/100-no-tests-docs.patch | 2 +- ...nfigure-allow-disable-fortify_source.patch | 2 - ...enabling-disabling-libudev-from-comm.patch | 2 - ...-guest_agent-no-matter-whether-softm.patch | 2 - ...lation-failure-when-isnan-is-a-macro.patch | 8 +- ...ilation-when-AS-is-actually-gcc-driv.patch | 4 +- ...util-mmap-alloc-fix-missing-MAP_SYNC.patch | 2 - ...ate-applets-for-guest-shutdown-modes.patch | 8 +- .../patches/020-remove-reallocarray.patch | 2 - ...twork-avoid-segfault-in-freeaddrinfo.patch | 15 +-- utils/readsb/patches/010-gcc10.patch | 6 -- utils/relayctl/patches/0001-ftdi1.patch | 10 +- .../patches/001-no_ordering_cd_joke.patch | 7 +- utils/rrdtool1/patches/002-no_timezone.patch | 4 +- .../rrdtool1/patches/020-x86-float-cast.patch | 6 +- .../rrdtool1/patches/030-pod2man-stderr.patch | 6 +- .../patches/002-remove-uneeded.patch | 6 +- .../patches/101-fix_uclibc_std_rand.patch | 6 +- ...viour_in_case_XML_support_is_missing.patch | 19 +--- .../0001-sepolgen-adjust-data_dir.patch | 7 +- ...hardcode-search-for-ausearch-in-sbin.patch | 5 - utils/setools/patches/010-no-format.patch | 7 +- utils/setools/patches/020-no-deprecated.patch | 2 +- utils/setserial/patches/010-no-docs.patch | 2 - .../patches/001-use-external-drivedb.patch | 8 +- .../patches/002-os_mailer-is-mailx.patch | 2 - .../patches/004-modem-processes.patch | 4 +- utils/squashfs-tools/patches/010-gcc10.patch | 2 - utils/tang/patches/010-makefile.patch | 2 +- utils/tang/patches/020-no-systemd.patch | 2 +- utils/telldus-core/patches/200-no-iconv.patch | 4 +- utils/telldus-core/patches/930-usleep.patch | 2 +- .../patches/001-override-git-version.patch | 37 ++++--- .../unzip/patches/010-remove-build-date.patch | 2 +- ...18-1000035-overflow-password-protect.patch | 10 +- ...ompilation-date-in-SOURCE_DATE_EPOCH.patch | 8 +- .../002-remove_helptags_generation.patch | 2 +- ...version_hash_and_fix_release_version.patch | 6 +- utils/yara/patches/010-openssl.patch | 4 +- utils/ykpers/patches/020-json-c-0.14.patch | 10 +- 558 files changed, 1518 insertions(+), 2977 deletions(-) diff --git a/admin/backuppc/patches/001-debian-fixes.patch b/admin/backuppc/patches/001-debian-fixes.patch index 3701755723..cd7de57665 100644 --- a/admin/backuppc/patches/001-debian-fixes.patch +++ b/admin/backuppc/patches/001-debian-fixes.patch @@ -1,6 +1,6 @@ ---- a/bin/BackupPC_archive 2017-01-26 02:31:24.000000000 +0100 -+++ b/bin/BackupPC_archive 2018-04-05 21:11:14.428000000 +0200 -@@ -299,7 +299,7 @@ +--- a/bin/BackupPC_archive ++++ b/bin/BackupPC_archive +@@ -299,7 +299,7 @@ sub ArchiveCleanup if ( $NeedPostCmd ) { UserCommandRun("ArchivePostUserCmd"); if ( $? && $Conf{UserCmdCheckStatus} ) { @@ -9,9 +9,9 @@ $stat{xferOK} = 0; } } ---- a/bin/BackupPC_dump 2017-01-26 02:31:24.000000000 +0100 -+++ b/bin/BackupPC_dump 2018-04-05 21:12:23.640000000 +0200 -@@ -1067,7 +1067,7 @@ +--- a/bin/BackupPC_dump ++++ b/bin/BackupPC_dump +@@ -1067,7 +1067,7 @@ sub catch_signal # Send ALRMs to BackupPC_tarExtract if we are using it # if ( $tarPid > 0 ) { @@ -20,9 +20,9 @@ } # ---- a/configure.pl 2017-01-26 02:31:24.000000000 +0100 -+++ b/configure.pl 2018-04-05 21:39:24.668000000 +0200 -@@ -333,7 +333,10 @@ +--- a/configure.pl ++++ b/configure.pl +@@ -333,7 +333,10 @@ while ( 1 ) { $Conf{BackupPCUser} || "backuppc", "backuppc-user"); if ( $opts{"set-perms"} ) { @@ -34,7 +34,7 @@ last if ( $name ne "" ); print </ @@ -64,9 +64,9 @@ || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/ || $s =~ /^tar: dumped \d+ files/ || $s =~ /^\s*added interface/i ---- a/lib/BackupPC/Lib.pm 2017-01-26 02:31:24.000000000 +0100 -+++ b/lib/BackupPC/Lib.pm 2018-04-05 21:48:38.048000000 +0200 -@@ -512,7 +512,8 @@ +--- a/lib/BackupPC/Lib.pm ++++ b/lib/BackupPC/Lib.pm +@@ -512,7 +512,8 @@ sub dirRead } if ( $IODirentOk ) { @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh)); @@ -76,9 +76,9 @@ } else { @entries = map { { name => $_} } readdir($fh); } ---- a/lib/BackupPC/Xfer/Smb.pm 2017-01-26 02:31:24.000000000 +0100 -+++ b/lib/BackupPC/Xfer/Smb.pm 2018-04-05 21:57:16.616000000 +0200 -@@ -219,7 +219,7 @@ +--- a/lib/BackupPC/Xfer/Smb.pm ++++ b/lib/BackupPC/Xfer/Smb.pm +@@ -219,7 +219,7 @@ sub readOutput # # MAKSYM 14082016: The next regex will never match on Samba-4.3, as # smbclient doesn't produce output required; keeping it for older Sambas @@ -87,7 +87,7 @@ my $sambaFileSize = $1; my $pcFileName = $2; (my $fileName = $pcFileName) =~ s/\\/\//g; -@@ -281,6 +281,9 @@ +@@ -281,6 +281,9 @@ sub readOutput } elsif ( /smb: \\>/ || /^\s*tar:\d+/ # MAKSYM 14082016: ignoring 2 more Samba-4.3 specific lines || /^\s*WARNING:/i diff --git a/admin/gkrellmd/patches/100-conf.patch b/admin/gkrellmd/patches/100-conf.patch index c4b9ea20ee..8716a31a95 100644 --- a/admin/gkrellmd/patches/100-conf.patch +++ b/admin/gkrellmd/patches/100-conf.patch @@ -1,7 +1,5 @@ -Index: gkrellm-2.3.10/server/gkrellmd.conf -=================================================================== ---- gkrellm-2.3.10.orig/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 -+++ gkrellm-2.3.10/server/gkrellmd.conf 2008-03-09 10:19:26.000000000 +0100 +--- a/server/gkrellmd.conf ++++ b/server/gkrellmd.conf @@ -4,7 +4,7 @@ # the client update frequency. Values may be from 1 to 10 and should be # smaller values to reduce network traffic. @@ -31,5 +29,5 @@ Index: gkrellm-2.3.10/server/gkrellmd.conf -#detach +detach - # Time interval between checks for various monitors. If nfs-interval - # is <= 0 then gkrellmd will not read data for nfs file system types. + # Enable writing logging message to the system syslog file + # NOTE: On windows this enables logging to the windows event log diff --git a/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch b/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch index 30948775e6..582e17d433 100644 --- a/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch +++ b/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch @@ -11,11 +11,9 @@ Fixes: ID:461 src/plugins/lanplus/lanplus_crypt_impl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index d5fac37..3c0df23 100644 --- a/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) { @@ -30,7 +28,7 @@ index d5fac37..3c0df23 100644 *bytes_written = 0; -@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); @@ -39,7 +37,7 @@ index d5fac37..3c0df23 100644 { /* Error */ *bytes_written = 0; -@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ { uint32_t tmplen; @@ -48,7 +46,7 @@ index d5fac37..3c0df23 100644 { *bytes_written = 0; return; /* Error */ -@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ { /* Success */ *bytes_written += tmplen; @@ -57,7 +55,7 @@ index d5fac37..3c0df23 100644 } } } -@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) { @@ -72,7 +70,7 @@ index d5fac37..3c0df23 100644 if (verbose >= 5) -@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); @@ -81,7 +79,7 @@ index d5fac37..3c0df23 100644 { /* Error */ lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); -@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ { uint32_t tmplen; @@ -90,7 +88,7 @@ index d5fac37..3c0df23 100644 { char buffer[1000]; ERR_error_string(ERR_get_error(), buffer); -@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ { /* Success */ *bytes_written += tmplen; @@ -99,6 +97,3 @@ index d5fac37..3c0df23 100644 } } --- -2.16.1 - diff --git a/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch b/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch index cd4f730737..9690d879b6 100644 --- a/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch +++ b/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch @@ -9,11 +9,9 @@ Complaint was that ctx isn't initialized. src/plugins/lanplus/lanplus_crypt_impl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 3c0df23..d12d0e3 100644 --- a/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) { @@ -22,7 +20,7 @@ index 3c0df23..d12d0e3 100644 EVP_CIPHER_CTX_init(ctx); EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); EVP_CIPHER_CTX_set_padding(ctx, 0); -@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) { @@ -31,6 +29,3 @@ index 3c0df23..d12d0e3 100644 EVP_CIPHER_CTX_init(ctx); EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); EVP_CIPHER_CTX_set_padding(ctx, 0); --- -2.16.1 - diff --git a/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch b/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch index 91aed82fbc..db388e4efa 100644 --- a/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch +++ b/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch @@ -11,11 +11,9 @@ deprecated, and by checking return value of call to former function. src/plugins/lanplus/lanplus_crypt_impl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index d12d0e3..0e330c1 100644 --- a/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint32_t * bytes_written) { EVP_CIPHER_CTX *ctx = NULL; @@ -31,7 +29,7 @@ index d12d0e3..0e330c1 100644 *bytes_written = 0; -@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_ uint32_t * bytes_written) { EVP_CIPHER_CTX *ctx = NULL; @@ -48,6 +46,3 @@ index d12d0e3..0e330c1 100644 if (verbose >= 5) { printbuf(iv, 16, "decrypting with this IV"); --- -2.16.1 - diff --git a/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch b/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch index 65a40b0236..c081cc53a2 100644 --- a/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch +++ b/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch @@ -10,11 +10,9 @@ leak. src/plugins/lanplus/lanplus_crypt_impl.c | 44 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 21 deletions(-) -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 0e330c1..9652a5e 100644 --- a/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint32_t * bytes_written) { EVP_CIPHER_CTX *ctx = NULL; @@ -28,7 +26,7 @@ index 0e330c1..9652a5e 100644 *bytes_written = 0; -@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_ printbuf(input, input_length, "encrypting this data"); } @@ -43,7 +41,7 @@ index 0e330c1..9652a5e 100644 /* * The default implementation adds a whole block of padding if the input -@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_ { /* Error */ *bytes_written = 0; @@ -51,7 +49,7 @@ index 0e330c1..9652a5e 100644 } else { -@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) { @@ -71,7 +69,7 @@ index 0e330c1..9652a5e 100644 } -@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_ uint32_t * bytes_written) { EVP_CIPHER_CTX *ctx = NULL; @@ -85,7 +83,7 @@ index 0e330c1..9652a5e 100644 if (verbose >= 5) { -@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_ printbuf(input, input_length, "decrypting this data"); } @@ -107,7 +105,7 @@ index 0e330c1..9652a5e 100644 /* * The default implementation adds a whole block of padding if the input * data is perfectly aligned. We would like to keep that from happening. -@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_ /* Error */ lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); *bytes_written = 0; @@ -115,7 +113,7 @@ index 0e330c1..9652a5e 100644 } else { -@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) { @@ -139,6 +137,3 @@ index 0e330c1..9652a5e 100644 if (verbose >= 5) { --- -2.16.1 - diff --git a/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch b/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch index 7f2923fd89..308079189e 100644 --- a/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch +++ b/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch @@ -14,11 +14,9 @@ Signed-off-by: Rosen Penev src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 9652a5e..e94401e 100644 --- a/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, +@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); return; } @@ -30,7 +28,7 @@ index 9652a5e..e94401e 100644 EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); EVP_CIPHER_CTX_set_padding(ctx, 0); -@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, +@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); return; } @@ -42,6 +40,3 @@ index 9652a5e..e94401e 100644 EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); EVP_CIPHER_CTX_set_padding(ctx, 0); --- -2.7.4 - diff --git a/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch b/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch index 48fe5eeb74..17341c98f3 100644 --- a/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch +++ b/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch @@ -17,8 +17,6 @@ The same issue affects the `read_fru_area` function. lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index cf00effc82a2..af99aa99444c 100644 --- a/lib/ipmi_fru.c +++ b/lib/ipmi_fru.c @@ -615,7 +615,10 @@ int @@ -33,7 +31,7 @@ index cf00effc82a2..af99aa99444c 100644 struct ipmi_rs * rsp; struct ipmi_rq req; uint8_t msg_data[4]; -@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, s finish = offset + length; if (finish > fru->size) { @@ -46,7 +44,7 @@ index cf00effc82a2..af99aa99444c 100644 } memset(&req, 0, sizeof(req)); -@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, s } } @@ -54,7 +52,7 @@ index cf00effc82a2..af99aa99444c 100644 do { tmp = fru->access ? off >> 1 : off; msg_data[0] = id; -@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, s } tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; @@ -73,7 +71,7 @@ index cf00effc82a2..af99aa99444c 100644 /* sometimes the size returned in the Info command * is too large. return 0 so higher level function * still attempts to parse what was returned */ -@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * uint32_t offset, uint32_t length, uint8_t *frubuf) { static uint32_t fru_data_rqst_size = 20; @@ -84,7 +82,7 @@ index cf00effc82a2..af99aa99444c 100644 struct ipmi_rs * rsp; struct ipmi_rq req; uint8_t msg_data[4]; -@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * finish = offset + length; if (finish > fru->size) { @@ -97,7 +95,7 @@ index cf00effc82a2..af99aa99444c 100644 } memset(&req, 0, sizeof(req)); -@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * if (fru->access && fru_data_rqst_size > 16) #endif fru_data_rqst_size = 16; @@ -106,7 +104,7 @@ index cf00effc82a2..af99aa99444c 100644 do { tmp = fru->access ? off >> 1 : off; msg_data[0] = id; -@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, +@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * } tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; @@ -123,6 +121,3 @@ index cf00effc82a2..af99aa99444c 100644 /* sometimes the size returned in the Info command * is too large. return 0 so higher level function --- -2.27.0 - diff --git a/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch index d694c92527..2656dfccc1 100644 --- a/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch +++ b/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch @@ -16,11 +16,9 @@ copy into the buffer. lib/dimm_spd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c -index 41e30dbb4bda..68f3b4fa1eff 100644 --- a/lib/dimm_spd.c +++ b/lib/dimm_spd.c -@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) +@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * in struct ipmi_rq req; struct fru_info fru; uint8_t *spd_data, msg_data[4]; @@ -29,7 +27,7 @@ index 41e30dbb4bda..68f3b4fa1eff 100644 msg_data[0] = id; -@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) +@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * in } len = rsp->data[0]; @@ -43,6 +41,3 @@ index 41e30dbb4bda..68f3b4fa1eff 100644 memcpy(&spd_data[offset], rsp->data + 1, len); offset += len; } while (offset < fru.size); --- -2.27.0 - diff --git a/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch index 6d8cc1549b..00ecd42723 100644 --- a/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch +++ b/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch @@ -13,11 +13,9 @@ overflow. lib/ipmi_session.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c -index 141f0f4ec8dd..b9af1fd75d40 100644 --- a/lib/ipmi_session.c +++ b/lib/ipmi_session.c -@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, +@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf } else { @@ -30,7 +28,7 @@ index 141f0f4ec8dd..b9af1fd75d40 100644 } break; -@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, +@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf break; } @@ -43,6 +41,3 @@ index 141f0f4ec8dd..b9af1fd75d40 100644 } while (i <= session_info.session_slot_count); break; --- -2.27.0 - diff --git a/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch b/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch index dd29993b1c..e4ea7734fa 100644 --- a/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch +++ b/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch @@ -16,11 +16,9 @@ on the final copy. lib/ipmi_channel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c -index fab2e5483d12..8cd7c59a4273 100644 --- a/lib/ipmi_channel.c +++ b/lib/ipmi_channel.c -@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, +@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ip lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); return -1; } @@ -32,6 +30,3 @@ index fab2e5483d12..8cd7c59a4273 100644 lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", val2str(rsp->ccode, completion_code_vals)); return -1; --- -2.27.0 - diff --git a/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch index e7a797077b..cf33f9d9d0 100644 --- a/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch +++ b/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch @@ -16,11 +16,9 @@ stack buffer overflow can occur. lib/ipmi_lanp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c -index 65d881bc5890..022c7f1605ed 100644 --- a/lib/ipmi_lanp.c +++ b/lib/ipmi_lanp.c -@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -29,7 +27,7 @@ index 65d881bc5890..022c7f1605ed 100644 /* set new ipaddr */ memcpy(data+3, temp, 4); printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert, -@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -38,7 +36,7 @@ index 65d881bc5890..022c7f1605ed 100644 /* set new macaddr */ memcpy(data+7, temp, 6); printf("Setting LAN Alert %d MAC Address to " -@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -47,7 +45,7 @@ index 65d881bc5890..022c7f1605ed 100644 if (strncasecmp(argv[1], "def", 3) == 0 || strncasecmp(argv[1], "default", 7) == 0) { -@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -56,7 +54,7 @@ index 65d881bc5890..022c7f1605ed 100644 if (strncasecmp(argv[1], "on", 2) == 0 || strncasecmp(argv[1], "yes", 3) == 0) { -@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -65,7 +63,7 @@ index 65d881bc5890..022c7f1605ed 100644 if (strncasecmp(argv[1], "pet", 3) == 0) { printf("Setting LAN Alert %d destination to PET Trap\n", alert); -@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -74,7 +72,7 @@ index 65d881bc5890..022c7f1605ed 100644 if (str2uchar(argv[1], &data[2]) != 0) { lprintf(LOG_ERR, "Invalid time: %s", argv[1]); -@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, +@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in if (p == NULL) { return (-1); } @@ -83,6 +81,3 @@ index 65d881bc5890..022c7f1605ed 100644 if (str2uchar(argv[1], &data[3]) != 0) { lprintf(LOG_ERR, "Invalid retry: %s", argv[1]); --- -2.27.0 - diff --git a/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch b/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch index 6cc5b7aad5..2fd34d186e 100644 --- a/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch +++ b/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch @@ -23,11 +23,9 @@ into fixed buffer of size `17` bytes from this calculated length. lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 17 deletions(-) -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index af99aa99444c..98bc9840955a 100644 --- a/lib/ipmi_fru.c +++ b/lib/ipmi_fru.c -@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru) +@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, return 0; memset(desc, 0, sizeof(desc)); @@ -36,11 +34,9 @@ index af99aa99444c..98bc9840955a 100644 desc[fru->id_code & 0x01f] = 0; printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id); -diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c -index 2a9cbe3087af..62aac08a9002 100644 --- a/lib/ipmi_sdr.c +++ b/lib/ipmi_sdr.c -@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf, +@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct i return -1; memset(desc, 0, sizeof (desc)); @@ -49,7 +45,7 @@ index 2a9cbe3087af..62aac08a9002 100644 if (verbose) { printf("Sensor ID : %s (0x%x)\n", -@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf, +@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct return -1; memset(desc, 0, sizeof (desc)); @@ -58,7 +54,7 @@ index 2a9cbe3087af..62aac08a9002 100644 if (verbose == 0) { if (csv_output) -@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf, +@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(st char desc[17]; memset(desc, 0, sizeof (desc)); @@ -67,7 +63,7 @@ index 2a9cbe3087af..62aac08a9002 100644 if (!verbose) { if (csv_output) -@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf, +@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct char desc[17]; memset(desc, 0, sizeof (desc)); @@ -76,7 +72,7 @@ index 2a9cbe3087af..62aac08a9002 100644 if (!verbose) { if (csv_output) -@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id, +@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct int rc =0; char desc[17]; @@ -132,6 +128,3 @@ index 2a9cbe3087af..62aac08a9002 100644 return rc; } --- -2.27.0 - diff --git a/admin/ipmitool/patches/0012-gcc10.patch b/admin/ipmitool/patches/0012-gcc10.patch index e52cb82db3..1fba0b79b9 100644 --- a/admin/ipmitool/patches/0012-gcc10.patch +++ b/admin/ipmitool/patches/0012-gcc10.patch @@ -9,8 +9,6 @@ Signed-off-by: Vaclav Dolezal lib/ipmi_hpmfwupg.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h -index de65292b..07f597be 100644 --- a/include/ipmitool/ipmi_hpmfwupg.h +++ b/include/ipmitool/ipmi_hpmfwupg.h @@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { @@ -22,11 +20,9 @@ index de65292b..07f597be 100644 #define TARGET_VER (0x01) #define ROLLBACK_VER (0x02) -diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c -index 4aa8cecd..d63d2c15 100644 --- a/lib/ipmi_hpmfwupg.c +++ b/lib/ipmi_hpmfwupg.c -@@ -58,6 +58,8 @@ +@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(stru extern int verbose; diff --git a/admin/netatop/patches/010-daemon-makefile-ldflags.patch b/admin/netatop/patches/010-daemon-makefile-ldflags.patch index 8601da8786..5a9adc506e 100644 --- a/admin/netatop/patches/010-daemon-makefile-ldflags.patch +++ b/admin/netatop/patches/010-daemon-makefile-ldflags.patch @@ -1,5 +1,3 @@ -diff --git a/daemon/Makefile b/daemon/Makefile -index e028e95..1233855 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -6,7 +6,7 @@ THISDIR = $(shell pwd) diff --git a/admin/schroot/patches/01-openwrt.patch b/admin/schroot/patches/01-openwrt.patch index 9b26b47225..bba6376512 100644 --- a/admin/schroot/patches/01-openwrt.patch +++ b/admin/schroot/patches/01-openwrt.patch @@ -1,5 +1,5 @@ ---- ./configure.ac-orig 2019-12-09 12:56:45.217308628 +0100 -+++ ./configure.ac 2019-12-09 12:57:18.667492923 +0100 +--- a/configure.ac ++++ b/configure.ac @@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then HAVE_DOXYGEN="no" fi @@ -91,8 +91,8 @@ AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams]) saved_LIBS="${LIBS}" ---- ./bin/schroot-base/schroot-base-run.h-orig 2019-12-09 04:23:51.881428446 +0100 -+++ ./bin/schroot-base/schroot-base-run.h 2019-12-09 04:24:14.934887089 +0100 +--- a/bin/schroot-base/schroot-base-run.h ++++ b/bin/schroot-base/schroot-base-run.h @@ -61,8 +61,8 @@ namespace schroot_base std::cout.imbue(std::locale()); std::cerr.imbue(std::locale()); @@ -104,8 +104,8 @@ typename options_type::ptr opts(new options_type); main_type kit(opts); ---- ./sbuild/sbuild-feature.h-orig 2019-12-09 04:23:51.881428446 +0100 -+++ ./sbuild/sbuild-feature.h 2019-12-09 04:24:14.934887089 +0100 +--- a/sbuild/sbuild-feature.h ++++ b/sbuild/sbuild-feature.h @@ -24,6 +24,7 @@ #include @@ -114,8 +114,8 @@ namespace sbuild { ---- ./etc/setup.d/20copyfiles-orig 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/setup.d/20copyfiles 2019-12-09 13:56:45.277145648 +0100 +--- a/etc/setup.d/20copyfiles ++++ b/etc/setup.d/20copyfiles @@ -39,9 +39,9 @@ copy_file() if [ -e "$2" ]; then @@ -128,8 +128,8 @@ if [ "$da" = "$db" ]; then COPY="false" ---- ./etc/setup.d/20nssdatabases-orig 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/setup.d/20nssdatabases 2019-12-09 13:57:34.397419039 +0100 +--- a/etc/setup.d/20nssdatabases ++++ b/etc/setup.d/20nssdatabases @@ -29,7 +29,7 @@ set -e dup_nss() { @@ -151,47 +151,44 @@ # If the database inside and outside the chroot is the # same, it's very likely that dup_nss would blank the -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/all/all/nssdatabases ./etc/profile-templates/all/all/nssdatabases ---- ./etc/profile-templates/all/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/all/all/nssdatabases 2019-12-09 14:03:12.799297723 +0100 -@@ -4,4 +4,4 @@ +--- a/etc/profile-templates/all/all/nssdatabases ++++ b/etc/profile-templates/all/all/nssdatabases +@@ -3,5 +3,5 @@ + # passwd shadow -group -gshadow +#group +#gshadow -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/buildd/all/nssdatabases ./etc/profile-templates/buildd/all/nssdatabases ---- ./etc/profile-templates/buildd/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/buildd/all/nssdatabases 2019-12-09 14:03:12.802631074 +0100 -@@ -4,4 +4,4 @@ +--- a/etc/profile-templates/buildd/all/nssdatabases ++++ b/etc/profile-templates/buildd/all/nssdatabases +@@ -3,5 +3,5 @@ + # passwd shadow -group -gshadow +#group +#gshadow -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/all/nssdatabases ./etc/profile-templates/default/all/nssdatabases ---- ./etc/profile-templates/default/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/default/all/nssdatabases 2019-12-09 14:03:12.809297778 +0100 +--- a/etc/profile-templates/default/all/nssdatabases ++++ b/etc/profile-templates/default/all/nssdatabases @@ -1,4 +1,4 @@ services protocols -networks +#networks hosts -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/all/nssdatabases ./etc/profile-templates/desktop/all/nssdatabases ---- ./etc/profile-templates/desktop/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/desktop/all/nssdatabases 2019-12-09 14:03:12.812631129 +0100 +--- a/etc/profile-templates/desktop/all/nssdatabases ++++ b/etc/profile-templates/desktop/all/nssdatabases @@ -1,4 +1,4 @@ services protocols -networks +#networks hosts -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/fstab ./etc/profile-templates/default/linux/fstab ---- ./etc/profile-templates/default/linux/fstab 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/default/linux/fstab 2019-12-09 14:18:46.970887080 +0100 +--- a/etc/profile-templates/default/linux/fstab ++++ b/etc/profile-templates/default/linux/fstab @@ -7,7 +7,7 @@ # to run additional services in the chroot. However, note that this # may potentially cause undesirable behaviour on upgrades, such as @@ -203,9 +200,8 @@ diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/f -#/run/shm /run/shm none rw,bind 0 0 +/tmp/shm /dev/shm none rw,bind 0 0 +/tmp/shm /run/shm none rw,bind 0 0 -diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/linux/fstab ./etc/profile-templates/desktop/linux/fstab ---- ./etc/profile-templates/desktop/linux/fstab 2018-11-03 14:26:12.000000000 +0100 -+++ ./etc/profile-templates/desktop/linux/fstab 2019-12-09 14:22:14.148555674 +0100 +--- a/etc/profile-templates/desktop/linux/fstab ++++ b/etc/profile-templates/desktop/linux/fstab @@ -12,7 +12,7 @@ # to run additional services in the chroot. However, note that this # may potentially cause undesirable behaviour on upgrades, such as diff --git a/admin/sudo/patches/010-cross-compile-fixes.patch b/admin/sudo/patches/010-cross-compile-fixes.patch index 92eceba398..1176727b7f 100644 --- a/admin/sudo/patches/010-cross-compile-fixes.patch +++ b/admin/sudo/patches/010-cross-compile-fixes.patch @@ -1,6 +1,6 @@ --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in -@@ -200,10 +200,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ +@@ -207,10 +207,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ esac siglist.c: mksiglist diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch index ec145488ce..374f6b4b81 100644 --- a/admin/sudo/patches/020-no-owner-change.patch +++ b/admin/sudo/patches/020-no-owner-change.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -64,7 +64,7 @@ SHELL = @SHELL@ +@@ -73,7 +73,7 @@ SHELL = @SHELL@ SED = @SED@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c diff --git a/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch b/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch index a00cbcde41..ead317e3ce 100644 --- a/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch +++ b/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch @@ -1,6 +1,6 @@ --- a/gcc/real.h +++ b/gcc/real.h -@@ -75,9 +75,10 @@ +@@ -70,9 +70,10 @@ struct GTY(()) real_value { + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */ /* Verify the guess. */ diff --git a/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch b/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch index 51bb148500..3708f615f9 100644 --- a/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch +++ b/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch @@ -1,12 +1,10 @@ @@ -0,0 +1,45 @@ -diff --git a/gcc/configure b/gcc/configure -index 3793681..bcda752 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h - +@@ -29036,19 +29036,6 @@ $as_echo "#define ENABLE_DEFAULT_SSP 1" fi - + + -# Test for on the target. - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 @@ -20,17 +18,15 @@ index 3793681..bcda752 100755 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 -$as_echo "$have_sys_sdt_h" >&6; } - + # Check if TFmode long double should be used by default or not. # Some glibc targets used DFmode long double, but with glibc 2.4 -diff --git a/gcc/configure.ac b/gcc/configure.ac -index 3ee1d67..e321218 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then - [Define if your target C library provides stack protector support]) +@@ -5787,16 +5787,6 @@ if test x$enable_default_ssp = xyes ; th fi - + AC_SUBST([enable_default_ssp]) + -# Test for on the target. -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) -AC_MSG_CHECKING(sys/sdt.h in the target C library) @@ -41,6 +37,6 @@ index 3ee1d67..e321218 100644 - [Define if your target C library provides sys/sdt.h]) -fi -AC_MSG_RESULT($have_sys_sdt_h) - + # Check if TFmode long double should be used by default or not. # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/devel/gcc/patches/260-musl-add-unwind-fix.patch b/devel/gcc/patches/260-musl-add-unwind-fix.patch index a3b83e2074..320a6ac5a3 100644 --- a/devel/gcc/patches/260-musl-add-unwind-fix.patch +++ b/devel/gcc/patches/260-musl-add-unwind-fix.patch @@ -19,7 +19,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-8 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c -@@ -59,6 +59,12 @@ +@@ -65,6 +65,12 @@ #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ && defined(TARGET_DL_ITERATE_PHDR) \ diff --git a/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch b/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch index 9d436efc18..fb4cb1533a 100644 --- a/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch +++ b/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch @@ -12,8 +12,6 @@ Signed-off-by: Yousong Zhou libffi/src/mips/o32.S | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) -diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S -index c6985d30a6f..8f25994773c 100644 --- a/libffi/src/mips/n32.S +++ b/libffi/src/mips/n32.S @@ -107,6 +107,16 @@ loadregs: @@ -89,8 +87,6 @@ index c6985d30a6f..8f25994773c 100644 cls_retstruct_small2: REG_L v0, V0_OFF2($sp) -diff --git a/libffi/src/mips/o32.S b/libffi/src/mips/o32.S -index eb279813a76..1aff4b14814 100644 --- a/libffi/src/mips/o32.S +++ b/libffi/src/mips/o32.S @@ -82,13 +82,16 @@ sixteen: @@ -170,6 +166,3 @@ index eb279813a76..1aff4b14814 100644 1: REG_L $3, V1_OFF2($fp) REG_L $2, V0_OFF2($fp) --- -2.16.3 - diff --git a/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch b/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch index 556fa16473..0822790d6b 100644 --- a/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch +++ b/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch @@ -25,8 +25,6 @@ at gcc pass3 gotools/Makefile.in | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/gotools/Makefile.am b/gotools/Makefile.am -index 5f3940a278b..9c22f5df103 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -26,6 +26,7 @@ PWD_COMMAND = $${PWDCMD-pwd} @@ -47,11 +45,9 @@ index 5f3940a278b..9c22f5df103 100644 GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ cmdsrcdir = $(srcdir)/../libgo/go/cmd -diff --git a/gotools/Makefile.in b/gotools/Makefile.in -index 4386576b011..0bdd9290e01 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in -@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs +@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd PWD_COMMAND = $${PWDCMD-pwd} STAMP = echo timestamp > libgodir = ../$(target_noncanonical)/libgo @@ -68,6 +64,3 @@ index 4386576b011..0bdd9290e01 100644 GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ cmdsrcdir = $(srcdir)/../libgo/go/cmd go_cmd_go_files = \ --- -2.16.3 - diff --git a/devel/gcc/patches/970-replace-memcpy-memset.patch b/devel/gcc/patches/970-replace-memcpy-memset.patch index c0680b5e91..1487d62961 100644 --- a/devel/gcc/patches/970-replace-memcpy-memset.patch +++ b/devel/gcc/patches/970-replace-memcpy-memset.patch @@ -1,7 +1,6 @@ -diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/beginend.cc ---- gcc-7.4.0-vanilla/libitm/beginend.cc 2017-01-01 07:07:43.905435000 -0500 -+++ gcc-7.4.0/libitm/beginend.cc 2019-11-09 00:31:10.093128945 -0500 -@@ -431,7 +431,7 @@ +--- a/libitm/beginend.cc ++++ b/libitm/beginend.cc +@@ -431,7 +431,7 @@ GTM::gtm_transaction_cp::save(gtm_thread // Save everything that we might have to restore on restarts or aborts. jb = tx->jb; undolog_size = tx->undolog.size(); @@ -10,7 +9,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine user_actions_size = tx->user_actions.size(); id = tx->id; prop = tx->prop; -@@ -449,7 +449,7 @@ +@@ -449,7 +449,7 @@ GTM::gtm_transaction_cp::commit(gtm_thre // commits of nested transactions. Allocation actions must be committed // before committing the snapshot. tx->jb = jb; @@ -19,7 +18,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine tx->id = id; tx->prop = prop; } -@@ -485,7 +485,7 @@ +@@ -485,7 +485,7 @@ GTM::gtm_thread::rollback (gtm_transacti prop = cp->prop; if (cp->disp != abi_disp()) set_abi_disp(cp->disp); @@ -28,10 +27,9 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine nesting = cp->nesting; } else -diff --recursive -u gcc-7.4.0-vanilla/libitm/method-ml.cc gcc-7.4.0/libitm/method-ml.cc ---- gcc-7.4.0-vanilla/libitm/method-ml.cc 2017-01-01 07:07:43.905435000 -0500 -+++ gcc-7.4.0/libitm/method-ml.cc 2019-11-09 01:12:58.674388557 -0500 -@@ -138,7 +138,9 @@ +--- a/libitm/method-ml.cc ++++ b/libitm/method-ml.cc +@@ -138,7 +138,9 @@ struct ml_mg : public method_group // This store is only executed while holding the serial lock, so relaxed // memory order is sufficient here. Same holds for the memset. time.store(0, memory_order_relaxed); diff --git a/devel/lpc21isp/patches/100-fix-reproducible-builds.patch b/devel/lpc21isp/patches/100-fix-reproducible-builds.patch index ad079954d4..ee26d07157 100644 --- a/devel/lpc21isp/patches/100-fix-reproducible-builds.patch +++ b/devel/lpc21isp/patches/100-fix-reproducible-builds.patch @@ -1,8 +1,6 @@ -Index: lpc21isp_197/lpc21isp.c -=================================================================== ---- lpc21isp_197.orig/lpc21isp.c 2017-12-03 06:01:05.854070061 +0100 -+++ lpc21isp_197/lpc21isp.c 2017-12-03 06:01:23.326431659 +0100 -@@ -1549,7 +1549,7 @@ +--- a/lpc21isp.c ++++ b/lpc21isp.c +@@ -1549,7 +1549,7 @@ static void ReadArguments(ISP_ENVIRONMEN DebugPrintf(2, "\n" "Portable command line ISP\n" "for NXP LPC family and Analog Devices ADUC 70xx\n" diff --git a/devel/lpc21isp/patches/110-bzero.patch b/devel/lpc21isp/patches/110-bzero.patch index 0ae6818c32..22c0124463 100644 --- a/devel/lpc21isp/patches/110-bzero.patch +++ b/devel/lpc21isp/patches/110-bzero.patch @@ -1,6 +1,6 @@ --- a/lpc21isp.c +++ b/lpc21isp.c -@@ -533,7 +533,7 @@ static void OpenSerialPort(ISP_ENVIRONMENT *IspEnvironment) +@@ -533,7 +533,7 @@ static void OpenSerialPort(ISP_ENVIRONME tcgetattr(IspEnvironment->fdCom, &IspEnvironment->oldtio); /* save current port settings */ diff --git a/devel/lpc21isp/patches/120-nanosleep.patch b/devel/lpc21isp/patches/120-nanosleep.patch index 02949aef8b..9e3ef9738a 100644 --- a/devel/lpc21isp/patches/120-nanosleep.patch +++ b/devel/lpc21isp/patches/120-nanosleep.patch @@ -1,6 +1,6 @@ --- a/lpc21isp.c +++ b/lpc21isp.c -@@ -1130,7 +1130,8 @@ void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment) +@@ -1130,7 +1130,8 @@ void ClearSerialPortBuffers(ISP_ENVIRONM */ void Sleep(unsigned long MilliSeconds) { diff --git a/devel/patch/patches/010-CVE-2018-6951.patch b/devel/patch/patches/010-CVE-2018-6951.patch index 19c3ccbbe3..eb8d51365c 100644 --- a/devel/patch/patches/010-CVE-2018-6951.patch +++ b/devel/patch/patches/010-CVE-2018-6951.patch @@ -10,11 +10,9 @@ for renames and copies (fix the existing check). src/pch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/pch.c b/src/pch.c -index ff9ed2c..bc6278c 100644 --- a/src/pch.c +++ b/src/pch.c -@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) +@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode if ((pch_rename () || pch_copy ()) && ! inname && ! ((i == OLD || i == NEW) && @@ -24,6 +22,3 @@ index ff9ed2c..bc6278c 100644 name_is_valid (p_name[! reverse]))) { say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); --- -2.19.1 - diff --git a/devel/patch/patches/020-CVE-2018-1000156.patch b/devel/patch/patches/020-CVE-2018-1000156.patch index f0583c12cb..bf16f8e641 100644 --- a/devel/patch/patches/020-CVE-2018-1000156.patch +++ b/devel/patch/patches/020-CVE-2018-1000156.patch @@ -16,8 +16,6 @@ instead of rejecting them and carrying on. 3 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 tests/ed-style -diff --git a/src/pch.c b/src/pch.c -index bc6278c..4fd5a05 100644 --- a/src/pch.c +++ b/src/pch.c @@ -33,6 +33,7 @@ @@ -28,7 +26,7 @@ index bc6278c..4fd5a05 100644 #define INITHUNKMAX 125 /* initial dynamic allocation size */ -@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char const *outname, +@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char c static char const editor_program[] = EDITOR_PROGRAM; file_offset beginning_of_this_line; @@ -71,7 +69,7 @@ index bc6278c..4fd5a05 100644 for (;;) { char ed_command_letter; beginning_of_this_line = file_tell (pfp); -@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, +@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char c } ed_command_letter = get_ed_command_letter (buf); if (ed_command_letter) { @@ -90,7 +88,7 @@ index bc6278c..4fd5a05 100644 write_fatal (); if (chars_read == 2 && strEQ (buf, ".\n")) break; -@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, +@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char c break; } } @@ -145,8 +143,6 @@ index bc6278c..4fd5a05 100644 if (ofp) { -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6b6df63..16f8693 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,6 +32,7 @@ TESTS = \ @@ -157,9 +153,6 @@ index 6b6df63..16f8693 100644 empty-files \ false-match \ fifo \ -diff --git a/tests/ed-style b/tests/ed-style -new file mode 100644 -index 0000000..d8c0689 --- /dev/null +++ b/tests/ed-style @@ -0,0 +1,41 @@ @@ -204,6 +197,3 @@ index 0000000..d8c0689 +check 'cat foo' < kernelmod/mrm_ctlfile.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/kernelmod/mrm_ctlfile.c b/kernelmod/mrm_ctlfile.c -index 85a8bf9..ca8e7d8 100644 --- a/kernelmod/mrm_ctlfile.c +++ b/kernelmod/mrm_ctlfile.c @@ -13,6 +13,7 @@ @@ -20,7 +18,7 @@ index 85a8bf9..ca8e7d8 100644 #include #include #include -@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __user *buf, size_t size, loff_t *off) { +@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __u } static long @@ -51,7 +49,7 @@ index 85a8bf9..ca8e7d8 100644 static const struct file_operations _fops = { owner: THIS_MODULE, open: &mrm_handle_open, -@@ -166,6 +176,7 @@ static const struct file_operations _fops = { +@@ -166,6 +176,7 @@ static const struct file_operations _fop read: &mrm_handle_read, unlocked_ioctl: (void*)&mrm_handle_ioctl, }; @@ -59,6 +57,3 @@ index 85a8bf9..ca8e7d8 100644 int mrm_init_ctlfile( void ) { struct proc_dir_entry *pde; --- -2.30.0 - diff --git a/lang/erlang/patches/010-openssl-deprecated.patch b/lang/erlang/patches/010-openssl-deprecated.patch index 91e76ab30a..a6395baac5 100644 --- a/lang/erlang/patches/010-openssl-deprecated.patch +++ b/lang/erlang/patches/010-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/lib/crypto/c_src/crypto_callback.c +++ b/lib/crypto/c_src/crypto_callback.c -@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */ +@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; / #include @@ -8,7 +8,7 @@ static INLINE void locking(int mode, ErlNifRWLock* lock) { switch (mode) { -@@ -132,7 +133,6 @@ static INLINE void locking(int mode, ErlNifRWLock* lock) +@@ -132,7 +133,6 @@ static INLINE void locking(int mode, Erl } } @@ -18,7 +18,7 @@ locking(mode, lock_vec[n]); --- a/lib/crypto/c_src/engine.c +++ b/lib/crypto/c_src/engine.c -@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER +@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(Erl #ifdef HAS_ENGINE_SUPPORT ASSERT(argc == 0); @@ -41,7 +41,7 @@ #ifdef HAVE_DYNAMIC_CRYPTO_LIB # if defined(DEBUG) -@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) +@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, in ASSERT(argc == 0); name_sz = strlen(libname); diff --git a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch index 7a6e469dff..84140e184a 100644 --- a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch +++ b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch @@ -22,11 +22,9 @@ Signed-off-by: Bernd Kuhls erts/emulator/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in -index 7145824..d079487 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in -@@ -712,7 +712,7 @@ +@@ -751,7 +751,7 @@ endif # Usually the same as the default rule, but certain platforms (e.g. win32) mix # different compilers $(OBJDIR)/beam_emu.o: beam/beam_emu.c @@ -35,7 +33,7 @@ index 7145824..d079487 100644 $(OBJDIR)/beam_emu.S: beam/beam_emu.c $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -@@ -765,7 +765,7 @@ +@@ -804,7 +804,7 @@ endif # General targets # $(OBJDIR)/%.o: beam/%.c diff --git a/lang/lua-coxpcall/patches/config.patch b/lang/lua-coxpcall/patches/config.patch index 2a1dbfd995..b96455a797 100644 --- a/lang/lua-coxpcall/patches/config.patch +++ b/lang/lua-coxpcall/patches/config.patch @@ -1,4 +1,4 @@ ---- lua-coxpcall-1.15.0_org/config 1970-01-01 08:00:00.000000000 +0800 -+++ lua-coxpcall-1.15.0/config 2014-06-04 16:51:55.487547258 +0800 +--- /dev/null ++++ b/config @@ -0,0 +1 @@ +LUA_DIR ?=$(DESTDIR)/usr/lib/lua diff --git a/lang/lua-md5/patches/config.patch b/lang/lua-md5/patches/config.patch index 85ec51fead..4c950376fa 100644 --- a/lang/lua-md5/patches/config.patch +++ b/lang/lua-md5/patches/config.patch @@ -1,5 +1,5 @@ ---- a/config 2019-11-01 13:58:27.907691645 +0800 -+++ b/config 2019-11-01 14:00:52.126290663 +0800 +--- a/config ++++ b/config @@ -1,16 +1,16 @@ # Installation directories diff --git a/lang/lua-md5/patches/makefile.patch b/lang/lua-md5/patches/makefile.patch index 89a2e33cd4..0f0f709c8f 100644 --- a/lang/lua-md5/patches/makefile.patch +++ b/lang/lua-md5/patches/makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile.orig 2014-06-04 17:16:40.083514808 +0800 -+++ b/Makefile 2014-06-04 17:17:27.111513780 +0800 +--- a/Makefile ++++ b/Makefile @@ -1,6 +1,6 @@ # $Id: Makefile,v 1.7 2007/10/11 00:02:56 carregal Exp $ diff --git a/lang/lua-openssl/patches/0001-Revise-Makefile.patch b/lang/lua-openssl/patches/0001-Revise-Makefile.patch index 44f4656347..e877c0fdcc 100644 --- a/lang/lua-openssl/patches/0001-Revise-Makefile.patch +++ b/lang/lua-openssl/patches/0001-Revise-Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index 10c1142..2a94df4 100644 --- a/Makefile +++ b/Makefile @@ -1,121 +1,52 @@ @@ -10,8 +8,7 @@ index 10c1142..2a94df4 100644 -CC := $(CROSS)$(CC) -AR := $(CROSS)$(AR) -LD := $(CROSS)$(LD) -+PKGC ?= pkg-config - +- -#OS auto detect -ifneq (,$(TARGET_SYS)) - SYS := $(TARGET_SYS) @@ -62,14 +59,15 @@ index 10c1142..2a94df4 100644 - #MACOSX_DEPLOYMENT_TARGET="10.3" - CC := MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(CC) -endif -+LIB_OPTION = -shared -+LUAPKGC = lua ++PKGC ?= pkg-config -ifneq (, $(findstring mingw, $(SYS))) - # Do mingw things - CFLAGS = -DLUA_LIB -DLUA_BUILD_AS_DLL -DWIN32_LEAN_AND_MEAN -endif -- ++LIB_OPTION = -shared ++LUAPKGC = lua + -ifneq (, $(findstring cygwin, $(SYS))) - # Do cygwin things - CFLAGS = -fPIC @@ -119,12 +117,12 @@ index 10c1142..2a94df4 100644 all: $T.so - @echo "Target system: "$(SYS) -- --$T.so: lib$T.a -- $(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS) + echo $(SYS) + $(CC) $(LDFLAGS) $(LIB_OPTION) $(OBJS) -o $@ +-$T.so: lib$T.a +- $(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS) +- -lib$T.a: $(OBJS) - $(AR) rcs $@ $? +$T.so: $(OBJS) diff --git a/lang/lua-rings/patches/config.patch b/lang/lua-rings/patches/config.patch index 5740faea90..05513782e4 100644 --- a/lang/lua-rings/patches/config.patch +++ b/lang/lua-rings/patches/config.patch @@ -1,5 +1,5 @@ ---- lua-rings-1.3.0_org/config 2014-06-04 15:24:24.223662038 +0800 -+++ lua-rings-1.3.0/config 2014-06-04 16:16:15.183594040 +0800 +--- a/config ++++ b/config @@ -1,15 +1,15 @@ # Installation directories @@ -19,7 +19,7 @@ # Lua includes directory LUA_INC ?= $(PREFIX)/include -@@ -24,6 +24,5 @@ +@@ -24,6 +24,5 @@ LIBNAME ?= $T.so.$V WARN ?= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -Wpointer-arith -pedantic INCS ?= -I$(LUA_INC) CFLAGS ?= $(WARN) $(INCS) diff --git a/lang/lua-rings/patches/makefile.patch b/lang/lua-rings/patches/makefile.patch index 8bb055120e..d639ef9163 100644 --- a/lang/lua-rings/patches/makefile.patch +++ b/lang/lua-rings/patches/makefile.patch @@ -1,5 +1,5 @@ ---- lua-rings-1.3.0_org/Makefile 2014-06-04 15:24:37.583661746 +0800 -+++ lua-rings-1.3.0/Makefile 2014-06-04 15:23:41.611662970 +0800 +--- a/Makefile ++++ b/Makefile @@ -3,6 +3,8 @@ T= rings CONFIG= ./config diff --git a/lang/lua-rs232/patches/100-remove-build-timestamps.patch b/lang/lua-rs232/patches/100-remove-build-timestamps.patch index 694c4720d6..4299cdf95b 100644 --- a/lang/lua-rs232/patches/100-remove-build-timestamps.patch +++ b/lang/lua-rs232/patches/100-remove-build-timestamps.patch @@ -8,7 +8,7 @@ #define MODULE_NAMESPACE "luars232" #define MODULE_VERSION "1.0.3" #define MODULE_BUILD "$Id: luars232.c 15 2011-02-23 09:02:20Z sp $" -@@ -553,9 +552,6 @@ +@@ -553,9 +552,6 @@ RS232_LIB int luaopen_luars232(lua_State lua_pushstring(L, MODULE_BUILD); lua_setfield(L, -2, "_BUILD"); diff --git a/lang/lualanes/patches/100-musl-compat.patch b/lang/lualanes/patches/100-musl-compat.patch index 2f3276b1f0..737ece1fd4 100644 --- a/lang/lualanes/patches/100-musl-compat.patch +++ b/lang/lualanes/patches/100-musl-compat.patch @@ -1,6 +1,6 @@ --- a/src/threading.h +++ b/src/threading.h -@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED }; +@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITIN #endif // PLATFORM_WIN32 #include diff --git a/lang/luaposix/patches/102-disable-compat-deprecated.patch b/lang/luaposix/patches/102-disable-compat-deprecated.patch index 1afe6065fc..4cc99f6dc5 100644 --- a/lang/luaposix/patches/102-disable-compat-deprecated.patch +++ b/lang/luaposix/patches/102-disable-compat-deprecated.patch @@ -1,5 +1,3 @@ -diff --git a/lib/posix/init.lua b/lib/posix/init.lua -index cf51bf3..e66af04 100644 --- a/lib/posix/init.lua +++ b/lib/posix/init.lua @@ -325,14 +325,6 @@ do diff --git a/lang/luaposix/patches/900-disable-ldoc.patch b/lang/luaposix/patches/900-disable-ldoc.patch index 7859807ff6..95bf886303 100644 --- a/lang/luaposix/patches/900-disable-ldoc.patch +++ b/lang/luaposix/patches/900-disable-ldoc.patch @@ -1,5 +1,3 @@ -diff --git a/lukefile b/lukefile -index 2d4bb2f..1e48540 100644 --- a/lukefile +++ b/lukefile @@ -29,8 +29,6 @@ incdirs = { diff --git a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff index 69ab5c593c..ab48a961d9 100644 --- a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff +++ b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff @@ -1,7 +1,6 @@ -diff -rupN luarocks/Makefile luarocks.new/Makefile ---- luarocks/Makefile 2015-02-19 13:24:07.027310956 +0200 -+++ luarocks.new/Makefile 2015-02-22 13:28:24.497353543 +0200 -@@ -104,7 +104,7 @@ build_bins: cleanup_bins +--- a/Makefile ++++ b/Makefile +@@ -89,7 +89,7 @@ build_bins: cleanup_bins for f in $(BIN_FILES) ;\ do \ sed "1d" src/bin/$$f > src/bin/$$f.bak ;\ @@ -10,4 +9,3 @@ diff -rupN luarocks/Makefile luarocks.new/Makefile echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\ cat src/bin/$$f.bak >> src/bin/$$f ;\ chmod +x src/bin/$$f ;\ -Binary files luarocks/src/bin/.luarocks.swp and luarocks.new/src/bin/.luarocks.swp differ diff --git a/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch b/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch index 5c9c96884b..d6da3fe1f5 100644 --- a/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch +++ b/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch @@ -1,7 +1,5 @@ -Index: luarocks-2.2.2/configure -=================================================================== ---- luarocks-2.2.2.orig/configure -+++ luarocks-2.2.2/configure +--- a/configure ++++ b/configure @@ -388,18 +388,22 @@ then fi diff --git a/lang/luasec/patches/100-fix-compilation.patch b/lang/luasec/patches/100-fix-compilation.patch index 61f0490a35..1c3bc3ba95 100644 --- a/lang/luasec/patches/100-fix-compilation.patch +++ b/lang/luasec/patches/100-fix-compilation.patch @@ -1,6 +1,6 @@ --- a/src/Makefile +++ b/src/Makefile -@@ -15,8 +15,8 @@ WARN=-Wall -pedantic +@@ -16,8 +16,8 @@ WARN=-Wall -pedantic BSD_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS) BSD_LDFLAGS=-O -fPIC -shared $(LIBDIR) @@ -11,7 +11,7 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)' MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS) -@@ -33,10 +33,10 @@ LDFLAGS += $(MYLDFLAGS) +@@ -34,10 +34,10 @@ LDFLAGS += $(MYLDFLAGS) all: install: $(CMOD) $(LMOD) diff --git a/lang/luasocket/patches/0001-Add-interface-support.patch b/lang/luasocket/patches/0001-Add-interface-support.patch index 00c279969e..293951d4e4 100644 --- a/lang/luasocket/patches/0001-Add-interface-support.patch +++ b/lang/luasocket/patches/0001-Add-interface-support.patch @@ -13,9 +13,6 @@ Subject: [PATCH] Add interface resolving create mode 100644 src/if.c create mode 100644 src/if.h -diff --git a/src/if.c b/src/if.c -new file mode 100644 -index 0000000..db231aa --- /dev/null +++ b/src/if.c @@ -0,0 +1,117 @@ @@ -136,9 +133,6 @@ index 0000000..db231aa + if_freenameindex(oni); + return 1; +} -diff --git a/src/if.h b/src/if.h -new file mode 100644 -index 0000000..dc7faf8 --- /dev/null +++ b/src/if.h @@ -0,0 +1,27 @@ @@ -169,8 +163,6 @@ index 0000000..dc7faf8 +int if_open(lua_State *L); + +#endif /* IF_H */ -diff --git a/src/luasocket.c b/src/luasocket.c -index e6ee747..85d41a6 100644 --- a/src/luasocket.c +++ b/src/luasocket.c @@ -21,6 +21,7 @@ @@ -189,11 +181,8 @@ index e6ee747..85d41a6 100644 {NULL, NULL} }; -diff --git a/src/makefile b/src/makefile -index 8d3521e..09d4882 100644 --- a/src/makefile +++ b/src/makefile - @@ -303,6 +303,7 @@ SOCKET_OBJS= \ compat.$(O) \ options.$(O) \ @@ -210,8 +199,6 @@ index 8d3521e..09d4882 100644 io.$(O): io.c io.h timeout.h luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \ timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \ -diff --git a/src/options.c b/src/options.c -index 8ac2a14..1c73e6f 100644 --- a/src/options.c +++ b/src/options.c @@ -7,7 +7,10 @@ @@ -239,5 +226,3 @@ index 8ac2a14..1c73e6f 100644 } else luaL_argerror(L, -1, "number 'interface' field expected"); } --- -1.8.4.rc3 diff --git a/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch b/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch index c759da100b..14ba072bff 100644 --- a/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch +++ b/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch @@ -1,6 +1,6 @@ --- a/src/makefile +++ b/src/makefile -@@ -397,18 +398,18 @@ none: +@@ -397,18 +397,18 @@ none: all: $(SOCKET_SO) $(MIME_SO) $(SOCKET_SO): $(SOCKET_OBJS) diff --git a/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch b/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch index b4efa9e518..da61f4ff82 100644 --- a/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch +++ b/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch @@ -1,5 +1,5 @@ ---- a/Makefile.PL 2009-09-22 16:22:09.000000000 -0600 -+++ b/Makefile.PL 2018-01-01 18:54:13.023366252 -0700 +--- a/Makefile.PL ++++ b/Makefile.PL @@ -1,7 +1,6 @@ # Do yourself a favour, and don't edit this file, see README for build instructions @@ -8,7 +8,7 @@ my @inc_search = qw(/opt/local/include /usr/local/include); my @lib_search = qw(/opt/local/lib64 /usr/local/lib64 /opt/local/lib /usr/local/lib); -@@ -12,15 +12,7 @@ unless (exists $args{INC} or exists $arg +@@ -13,28 +12,13 @@ unless (exists $args{INC} or exists $arg my @incpath = grep {-d} @inc_search; my @libpath = grep {-d} @lib_search; @@ -25,7 +25,6 @@ if ($have_sasl2) { $mmopt{DEFINE} = "-DSASL2" unless $use_sasl2; -@@ -28,13 +27,6 @@ unless (exists $args{INC} or exists $arg } else { exit(0) if $use_sasl2; @@ -39,7 +38,7 @@ } $mmopt{INC} = join " ", map {"-I$_"} @incpath; -@@ -58,7 +50,6 @@ WriteMakefile( +@@ -58,7 +42,6 @@ WriteMakefile( repository => 'http://github.com/gbarr/perl-authen-sasl-xs', }, build_requires => { diff --git a/lang/perl-device-usb/patches/100-fix_buildsystem.patch b/lang/perl-device-usb/patches/100-fix_buildsystem.patch index 5201894f24..30f7d6a6e6 100644 --- a/lang/perl-device-usb/patches/100-fix_buildsystem.patch +++ b/lang/perl-device-usb/patches/100-fix_buildsystem.patch @@ -6,7 +6,7 @@ Last-Update: 2013-10-28 --- a/Makefile.PL +++ b/Makefile.PL -@@ -2,6 +2,11 @@ +@@ -2,6 +2,11 @@ use strict; use warnings; use Inline::MakeMaker; diff --git a/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch b/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch index 9365eb40bd..dddd23aaed 100644 --- a/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch +++ b/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch @@ -8,9 +8,9 @@ From: Ansgar Burchardt Reviewed-by: gregor herrmann Last-Update: 2013-10-28 ---- libdevice-usb-perl.orig/Makefile.PL -+++ libdevice-usb-perl/Makefile.PL -@@ -21,7 +21,7 @@ +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -21,7 +21,7 @@ END } } @@ -19,7 +19,7 @@ Last-Update: 2013-10-28 { die <<"END"; ERROR: Can't find usb.h header. -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ following environment variables: END } diff --git a/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch b/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch index 9ce0ba3205..535579d910 100644 --- a/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch +++ b/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch @@ -98,7 +98,7 @@ } #if LIBUSB_HAS_GET_DRIVER_NP ret = usb_get_driver_np((usb_dev_handle *)dev, interface, name, namelen); -@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int interface, char *name, unsigned int name +@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int #endif } @@ -112,7 +112,7 @@ } #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP return usb_detach_kernel_driver_np((usb_dev_handle *)dev, interface); -@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void *dev, int interface) +@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void #endif } @@ -143,7 +143,7 @@ { int i = 0; int retval = 0; -@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int +@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int r if(DeviceUSBDebugLevel()) { @@ -152,7 +152,7 @@ requesttype, request, value, index, bytes, size, timeout ); /* maybe need to add support for printing the bytes string. */ -@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int +@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int r Inline_Stack_Done; } diff --git a/lang/perl-file-rsyncp/patches/001-no-subdirs.patch b/lang/perl-file-rsyncp/patches/001-no-subdirs.patch index 65bb42771d..746029a95e 100644 --- a/lang/perl-file-rsyncp/patches/001-no-subdirs.patch +++ b/lang/perl-file-rsyncp/patches/001-no-subdirs.patch @@ -1,6 +1,6 @@ ---- a/Makefile.PL 2010-07-25 22:50:02.000000000 +0200 -+++ b/Makefile.PL 2018-03-27 15:46:16.724000000 +0200 -@@ -8,7 +8,7 @@ +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -8,7 +8,7 @@ WriteMakefile( Getopt::Long => 2.24, # need OO interface }, 'PMLIBDIRS' => ['lib'], diff --git a/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path b/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path index 34221c0d20..8a46f5d8bb 100644 --- a/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path +++ b/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path @@ -16,8 +16,6 @@ Signed-off-by: Petr Písař Makefile.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.PL b/Makefile.PL -index f9170bb..ad2bd3d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -127,7 +127,7 @@ if (!defined($curl_h)) { @@ -29,6 +27,3 @@ index f9170bb..ad2bd3d 100644 next; } my ($group) = $e =~ m/^([^_]+_)/; --- -2.7.4 - diff --git a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch index e26d953dd0..0ef5f651c5 100644 --- a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch +++ b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch @@ -1,6 +1,6 @@ --- a/Curl.xs +++ b/Curl.xs -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ typedef struct { typedef struct { @@ -9,7 +9,7 @@ struct CURLM *curlm; #else struct void *curlm; -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ static perl_curl_multi * perl_curl_multi { perl_curl_multi *self; Newz(1, self, 1, perl_curl_multi); @@ -18,7 +18,7 @@ self->curlm=curl_multi_init(); #else croak("curl version too old to support curl_multi_init()"); -@@ -245,7 +245,7 @@ +@@ -245,7 +245,7 @@ static perl_curl_multi * perl_curl_multi /* delete the multi */ static void perl_curl_multi_delete(perl_curl_multi *self) { @@ -27,7 +27,7 @@ if (self->curlm) curl_multi_cleanup(self->curlm); Safefree(self); -@@ -1065,7 +1065,7 @@ +@@ -1065,7 +1065,7 @@ curl_multi_add_handle(curlm, curl) WWW::Curl::Multi curlm WWW::Curl::Easy curl CODE: @@ -36,7 +36,7 @@ curl_multi_add_handle(curlm->curlm, curl->curl); #endif -@@ -1074,7 +1074,7 @@ +@@ -1074,7 +1074,7 @@ curl_multi_remove_handle(curlm, curl) WWW::Curl::Multi curlm WWW::Curl::Easy curl CODE: @@ -45,7 +45,7 @@ curl_multi_remove_handle(curlm->curlm, curl->curl); #endif -@@ -1149,7 +1149,7 @@ +@@ -1149,7 +1149,7 @@ curl_multi_perform(self) PREINIT: int remaining; CODE: diff --git a/lang/perl-www-curl/patches/220-curl_7.69_compat.patch b/lang/perl-www-curl/patches/220-curl_7.69_compat.patch index 1b59a30a9b..bfedb91025 100644 --- a/lang/perl-www-curl/patches/220-curl_7.69_compat.patch +++ b/lang/perl-www-curl/patches/220-curl_7.69_compat.patch @@ -1,6 +1,6 @@ --- a/Makefile.PL +++ b/Makefile.PL -@@ -127,7 +127,7 @@ +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { close H; for my $e (sort @syms) { diff --git a/lang/php7-pecl-libevent/patches/010-libevent2.patch b/lang/php7-pecl-libevent/patches/010-libevent2.patch index 961fb36086..1511d298e4 100644 --- a/lang/php7-pecl-libevent/patches/010-libevent2.patch +++ b/lang/php7-pecl-libevent/patches/010-libevent2.patch @@ -1,7 +1,7 @@ --- a/libevent.c +++ b/libevent.c -@@ -42,10 +42,12 @@ - (rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type)) +@@ -37,10 +37,12 @@ + # define LIBEVENT_SOCKETS_SUPPORT #endif -#ifdef PHP_WIN32 diff --git a/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch b/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch index ceea3f2c82..f9ef5e4dbf 100644 --- a/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch +++ b/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch @@ -40,8 +40,6 @@ r1: initial revision ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 545 insertions(+), 3 deletions(-) -diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 -index 20e4164..a612436 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) @@ -64,8 +62,6 @@ index 20e4164..a612436 100644 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" -diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c -index 020da31..9b39c6e 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -26,8 +26,21 @@ @@ -90,7 +86,7 @@ index 020da31..9b39c6e 100644 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -88,6 +101,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz) +@@ -88,6 +101,11 @@ static int read_php_preamble(const unsig { uint32_t version; @@ -102,7 +98,7 @@ index 020da31..9b39c6e 100644 /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) +@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo } } @@ -533,7 +529,7 @@ index 020da31..9b39c6e 100644 { int left = 0, right = tzdb->index_size - 1; -@@ -438,9 +878,48 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const +@@ -438,9 +878,48 @@ static int seek_to_tz_position(const uns return 0; } @@ -582,7 +578,7 @@ index 020da31..9b39c6e 100644 } const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) -@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_ +@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_ int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -614,7 +610,7 @@ index 020da31..9b39c6e 100644 } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(char *name) +@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ct timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; @@ -630,7 +626,7 @@ index 020da31..9b39c6e 100644 tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, i +@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha } skip_posix_string(&tzf, tmp); diff --git a/lang/php7/patches/0032-Use-system-timezone.patch b/lang/php7/patches/0032-Use-system-timezone.patch index 00873eee42..14e5b86609 100644 --- a/lang/php7/patches/0032-Use-system-timezone.patch +++ b/lang/php7/patches/0032-Use-system-timezone.patch @@ -13,11 +13,9 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon ext/date/php_date.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index f049ae2..6a044ce 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -1030,6 +1030,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) +@@ -1032,6 +1032,23 @@ static char* guess_timezone(const timeli DATEG(timezone_valid) = 1; return DATEG(default_timezone); } diff --git a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch index afab2b4587..812262b4d3 100644 --- a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch +++ b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch @@ -13,7 +13,7 @@ Subject: Add patch to remove build timestamps from generated binaries. --- a/ext/standard/info.c +++ b/ext/standard/info.c -@@ -802,7 +802,6 @@ PHPAPI ZEND_COLD void php_print_info(int flag) +@@ -802,7 +802,6 @@ PHPAPI ZEND_COLD void php_print_info(int php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); @@ -47,7 +47,7 @@ Subject: Add patch to remove build timestamps from generated binaries. *aix*) --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c -@@ -2392,9 +2392,9 @@ parent_loop_end: +@@ -2400,9 +2400,9 @@ parent_loop_end: SG(headers_sent) = 1; SG(request_info).no_headers = 1; #if ZEND_DEBUG @@ -61,7 +61,7 @@ Subject: Add patch to remove build timestamps from generated binaries. fcgi_shutdown(); --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c -@@ -645,8 +645,8 @@ static int do_cli(int argc, char **argv) /* {{{ */ +@@ -648,8 +648,8 @@ static int do_cli(int argc, char **argv) goto out; case 'v': /* show php version & quit */ @@ -74,7 +74,7 @@ Subject: Add patch to remove build timestamps from generated binaries. #else --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c -@@ -1722,9 +1722,9 @@ int main(int argc, char *argv[]) +@@ -1717,9 +1717,9 @@ int main(int argc, char *argv[]) SG(request_info).no_headers = 1; #if ZEND_DEBUG @@ -88,7 +88,7 @@ Subject: Add patch to remove build timestamps from generated binaries. fcgi_shutdown(); --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c -@@ -1695,10 +1695,8 @@ phpdbg_main: +@@ -1697,10 +1697,8 @@ phpdbg_main: phpdbg_do_help_cmd(exec); } else if (show_version) { phpdbg_out( diff --git a/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch b/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch index f52afe9247..ed221695b2 100644 --- a/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch +++ b/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch @@ -7,8 +7,6 @@ Subject: Remove W3C validation icon to not expose the reader's IP address to sapi/fpm/status.html.in | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in -index 86492d7..31c31ff 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -70,11 +70,6 @@ diff --git a/lang/php7/patches/0050-remove-build-timestamps.patch b/lang/php7/patches/0050-remove-build-timestamps.patch index d1c0481923..2ef58c407e 100644 --- a/lang/php7/patches/0050-remove-build-timestamps.patch +++ b/lang/php7/patches/0050-remove-build-timestamps.patch @@ -1,6 +1,6 @@ --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c -@@ -2652,11 +2652,6 @@ static void accel_gen_system_id(void) +@@ -2667,11 +2667,6 @@ static void accel_gen_system_id(void) PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1); PHP_MD5Update(&context, ZEND_EXTENSION_BUILD_ID, sizeof(ZEND_EXTENSION_BUILD_ID)-1); PHP_MD5Update(&context, ZEND_BIN_ID, sizeof(ZEND_BIN_ID)-1); @@ -14,7 +14,7 @@ */ --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c -@@ -1284,9 +1284,9 @@ static int cli_main( int argc, char * ar +@@ -1288,9 +1288,9 @@ static int cli_main( int argc, char * ar case 'v': if (php_request_startup() != FAILURE) { #if ZEND_DEBUG diff --git a/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch b/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch index 7b8193c868..40506f7cc8 100644 --- a/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch +++ b/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch @@ -18,8 +18,6 @@ Signed-off-by: Michael Heimpold ext/opcache/config.m4 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 6c40cafc1..63fa5bb55 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -89,7 +89,10 @@ int main() { @@ -46,6 +44,3 @@ index 6c40cafc1..63fa5bb55 100644 AC_MSG_RESULT([$msg]) PHP_CHECK_FUNC_LIB(shm_open, rt) --- -2.17.1 - diff --git a/lang/php7/patches/1004-disable-phar-command.patch b/lang/php7/patches/1004-disable-phar-command.patch index ee478ad42f..6ac9524906 100644 --- a/lang/php7/patches/1004-disable-phar-command.patch +++ b/lang/php7/patches/1004-disable-phar-command.patch @@ -1,6 +1,6 @@ ---- a/ext/phar/config.m4 2016-08-17 21:50:58.000000000 +0200 -+++ b/ext/phar/config.m4 2016-09-20 22:21:28.494934775 +0200 -@@ -19,7 +19,7 @@ +--- a/ext/phar/config.m4 ++++ b/ext/phar/config.m4 +@@ -19,7 +19,7 @@ if test "$PHP_PHAR" != "no"; then fi PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) @@ -9,9 +9,9 @@ PHP_INSTALL_HEADERS([ext/phar], [php_phar.h]) ---- a/configure.ac 2016-09-20 22:26:38.000000000 +0200 -+++ b/configure.ac 2016-09-20 22:42:30.380101556 +0200 -@@ -1430,13 +1430,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1454,13 +1454,13 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libto INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch b/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch index bb0462256f..b5071bcd49 100644 --- a/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch +++ b/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch @@ -41,8 +41,6 @@ r1: initial revision ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 545 insertions(+), 3 deletions(-) -diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 -index 20e4164..a612436 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) @@ -65,8 +63,6 @@ index 20e4164..a612436 100644 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" -diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c -index 233c55c..4b70178 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -26,8 +26,21 @@ @@ -91,7 +87,7 @@ index 233c55c..4b70178 100644 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -94,6 +107,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz) +@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig { uint32_t version; @@ -103,7 +99,7 @@ index 233c55c..4b70178 100644 /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) +@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo } } @@ -534,7 +530,7 @@ index 233c55c..4b70178 100644 { int left = 0, right = tzdb->index_size - 1; -@@ -444,9 +884,48 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, +@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns return 0; } @@ -583,7 +579,7 @@ index 233c55c..4b70178 100644 } const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) -@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_ +@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_ int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -615,7 +611,7 @@ index 233c55c..4b70178 100644 } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name) +@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; @@ -631,7 +627,7 @@ index 233c55c..4b70178 100644 tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t +@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con } skip_posix_string(&tzf, tmp); diff --git a/lang/php8/patches/0022-Use-system-timezone.patch b/lang/php8/patches/0022-Use-system-timezone.patch index d17e161be4..b7ad1882c7 100644 --- a/lang/php8/patches/0022-Use-system-timezone.patch +++ b/lang/php8/patches/0022-Use-system-timezone.patch @@ -13,11 +13,9 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon ext/date/php_date.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 8c0f5a6..6b650ac 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -538,6 +538,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb) +@@ -538,6 +538,23 @@ static char* guess_timezone(const timeli DATEG(timezone_valid) = 1; return DATEG(default_timezone); } diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch index d5fba4b1a2..0ecc680e27 100644 --- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch +++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch @@ -7,11 +7,9 @@ Make generated php_config.h constant across rebuilds. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index dcfe883..9b94618 100644 --- a/configure.ac +++ b/configure.ac -@@ -1280,7 +1280,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1278,7 +1278,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch b/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch index 7bfe8b09b6..9934d1b2c2 100644 --- a/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch +++ b/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch @@ -7,8 +7,6 @@ Subject: Remove W3C validation icon to not expose the reader's IP address to sapi/fpm/status.html.in | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in -index d3b6d5e..f71d486 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -70,11 +70,6 @@ diff --git a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch index baa57f9406..6d95f51758 100644 --- a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch +++ b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch @@ -6,7 +6,7 @@ Subject: Add patch to remove build timestamps from generated binaries. --- a/ext/standard/info.c +++ b/ext/standard/info.c -@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int flag) +@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); @@ -54,7 +54,7 @@ Subject: Add patch to remove build timestamps from generated binaries. fcgi_shutdown(); --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c -@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv) /* {{{ */ +@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv) goto out; case 'v': /* show php version & quit */ @@ -67,7 +67,7 @@ Subject: Add patch to remove build timestamps from generated binaries. #else --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c -@@ -1694,9 +1694,9 @@ int main(int argc, char *argv[]) +@@ -1691,9 +1691,9 @@ int main(int argc, char *argv[]) SG(request_info).no_headers = 1; #if ZEND_DEBUG diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch index 6fbc7ceb43..2ec2ceac73 100644 --- a/lang/php8/patches/1004-disable-phar-command.patch +++ b/lang/php8/patches/1004-disable-phar-command.patch @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -1417,13 +1417,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1423,13 +1423,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch b/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch index cbabf91971..6f134fabb8 100644 --- a/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch +++ b/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch @@ -8,8 +8,6 @@ Signed-off-by: Michael Heimpold ext/opcache/jit/Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag -index d4f97de..7421897 100644 --- a/ext/opcache/jit/Makefile.frag +++ b/ext/opcache/jit/Makefile.frag @@ -1,6 +1,6 @@ @@ -20,6 +18,3 @@ index d4f97de..7421897 100644 $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc --- -2.17.1 - diff --git a/lang/python/micropython/patches/000-Makefile-no-errors.patch b/lang/python/micropython/patches/000-Makefile-no-errors.patch index 1ebfa4304a..4fe4f8344b 100644 --- a/lang/python/micropython/patches/000-Makefile-no-errors.patch +++ b/lang/python/micropython/patches/000-Makefile-no-errors.patch @@ -1,5 +1,3 @@ -diff --git a/ports/unix/Makefile b/ports/unix/Makefile -index cbdd3f3..0ab157d 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -21,7 +21,7 @@ INC += -I$(TOP) diff --git a/lang/python/python-augeas/patches/001-backport-ffi-fix.patch b/lang/python/python-augeas/patches/001-backport-ffi-fix.patch index 1ed618f2f0..4009469fb1 100644 --- a/lang/python/python-augeas/patches/001-backport-ffi-fix.patch +++ b/lang/python/python-augeas/patches/001-backport-ffi-fix.patch @@ -24,11 +24,9 @@ Closes https://github.com/hercules-team/python-augeas/issues/48. setup.py | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) -diff --git a/augeas/__init__.py b/augeas/__init__.py -index 0fc0d96..4af0200 100644 --- a/augeas/__init__.py +++ b/augeas/__init__.py -@@ -32,7 +32,7 @@ +@@ -32,7 +32,7 @@ format and the transformation into a tre from sys import version_info as _pyver @@ -37,8 +35,6 @@ index 0fc0d96..4af0200 100644 __author__ = "Nathaniel McCallum " __credits__ = """Jeff Schroeder -diff --git a/augeas/ffi.py b/augeas/ffi.py -index fdd8d1c..98b3175 100644 --- a/augeas/ffi.py +++ b/augeas/ffi.py @@ -1,9 +1,28 @@ @@ -73,7 +69,7 @@ index fdd8d1c..98b3175 100644 ffi.cdef(""" typedef struct augeas augeas; -@@ -59,7 +78,5 @@ +@@ -44,7 +63,5 @@ const char *aug_error_details(augeas *au void free(void *); """) @@ -81,11 +77,9 @@ index fdd8d1c..98b3175 100644 - if __name__ == "__main__": ffi.compile(verbose=True) -diff --git a/setup.py b/setup.py -index 65026c1..6c4265e 100755 --- a/setup.py +++ b/setup.py -@@ -22,6 +22,7 @@ +@@ -22,6 +22,7 @@ setup(name=name, setup_requires=["cffi>=1.0.0"], cffi_modules=["augeas/ffi.py:ffi"], install_requires=["cffi>=1.0.0"], diff --git a/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch b/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch index ea860fae0a..d7591100c9 100644 --- a/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch +++ b/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch @@ -1,6 +1,6 @@ --- a/lib/Crypto/Math/_IntegerGMP.py +++ b/lib/Crypto/Math/_IntegerGMP.py -@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX_ULONG; +@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX int __gmpz_divisible_ui_p (const mpz_t n, UNIX_ULONG d); """ diff --git a/lang/python/python-cryptodome/patches/002-omit-tests.patch b/lang/python/python-cryptodome/patches/002-omit-tests.patch index cbaf70f25b..37a922c54d 100644 --- a/lang/python/python-cryptodome/patches/002-omit-tests.patch +++ b/lang/python/python-cryptodome/patches/002-omit-tests.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -293,6 +293,9 @@ package_data = { +@@ -301,6 +301,9 @@ package_data = { ], } diff --git a/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch b/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch index e562df0d58..379c40c5a2 100644 --- a/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch +++ b/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch @@ -1,6 +1,6 @@ --- a/lib/Cryptodome/Math/_IntegerGMP.py +++ b/lib/Cryptodome/Math/_IntegerGMP.py -@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX_ULONG; +@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX int __gmpz_divisible_ui_p (const mpz_t n, UNIX_ULONG d); """ diff --git a/lang/python/python-cryptodomex/patches/002-omit-tests.patch b/lang/python/python-cryptodomex/patches/002-omit-tests.patch index cbaf70f25b..37a922c54d 100644 --- a/lang/python/python-cryptodomex/patches/002-omit-tests.patch +++ b/lang/python/python-cryptodomex/patches/002-omit-tests.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -293,6 +293,9 @@ package_data = { +@@ -301,6 +301,9 @@ package_data = { ], } diff --git a/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch b/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch index 37aab6c42d..dae6c8b03e 100644 --- a/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch +++ b/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Fix Python 3.9 compatibility issue with 'array' module intelhex/compat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/intelhex/compat.py b/intelhex/compat.py -index 194cd5d..2a6bee6 100644 --- a/intelhex/compat.py +++ b/intelhex/compat.py @@ -57,7 +57,8 @@ if sys.version_info[0] >= 3: @@ -21,6 +19,3 @@ index 194cd5d..2a6bee6 100644 IntTypes = (int,) StrType = str --- -2.28.0 - diff --git a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch b/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch index f1920e9592..3a2571b4cc 100644 --- a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch +++ b/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch @@ -1,5 +1,3 @@ -diff --git a/src/bindings/minimal/crypto_scalarmult.h b/src/bindings/minimal/crypto_scalarmult.h -index 06ca1ef..9bc3d8e 100644 --- a/src/bindings/minimal/crypto_scalarmult.h +++ b/src/bindings/minimal/crypto_scalarmult.h @@ -13,7 +13,7 @@ diff --git a/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch b/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch index b2a80a0fa8..6b86f6fa18 100644 --- a/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch +++ b/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch @@ -1,7 +1,6 @@ -diff -u --recursive libselinux-3.1-vanilla/src/Makefile libselinux-3.1/src/Makefile ---- libselinux-3.1-vanilla/src/Makefile 2020-07-10 11:17:15.000000000 -0400 -+++ libselinux-3.1/src/Makefile 2020-07-12 14:33:56.337229240 -0400 -@@ -131,7 +131,7 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -131,7 +131,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUB all: $(LIBA) $(LIBSO) $(LIBPC) pywrap: all selinuxswig_python_exception.i diff --git a/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch b/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch index 316f4e07d2..c900ff143b 100644 --- a/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch +++ b/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch @@ -7,8 +7,6 @@ Signed-off-by: W. Michael Petullo src/libselinux.pc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/libselinux.pc.in b/src/libselinux.pc.in -index 7c66b1fa..d9d58125 100644 --- a/src/libselinux.pc.in +++ b/src/libselinux.pc.in @@ -1,7 +1,7 @@ @@ -21,6 +19,3 @@ index 7c66b1fa..d9d58125 100644 Name: libselinux Description: SELinux utility library --- -2.26.2 - diff --git a/lang/python/python3/patches/003-do-not-run-distutils-tests.patch b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch index 4811370343..4b7e9124c6 100644 --- a/lang/python/python3/patches/003-do-not-run-distutils-tests.patch +++ b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch @@ -1,6 +1,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1524,6 +1524,7 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1525,6 +1525,7 @@ libinstall: build_all $(srcdir)/Modules/ $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt @@ -8,7 +8,7 @@ if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ -@@ -1559,6 +1560,7 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1560,6 +1561,7 @@ libinstall: build_all $(srcdir)/Modules/ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt diff --git a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch index c8bb69483f..edd375ea3e 100644 --- a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch +++ b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch @@ -1,6 +1,6 @@ --- a/Python/initconfig.c +++ b/Python/initconfig.c -@@ -157,7 +157,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo +@@ -158,7 +158,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */ int Py_FrozenFlag = 0; /* Needed by getpath.c */ int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */ diff --git a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch index 022198e32c..2565207cc0 100644 --- a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch +++ b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -749,7 +749,8 @@ class PyBuildExt(build_ext): +@@ -734,7 +734,8 @@ class PyBuildExt(build_ext): # only change this for cross builds for 3.3, issues on Mageia if CROSS_COMPILING: self.add_cross_compiling_paths() diff --git a/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch index a5945315f8..9c3777e1a7 100644 --- a/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch +++ b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -726,8 +726,9 @@ class PyBuildExt(build_ext): +@@ -711,8 +711,9 @@ class PyBuildExt(build_ext): # directly since an inconsistently reproducible issue comes up where # the environment variable is not set even though the value were passed # into configure and stored in the Makefile (issue found on OS X 10.3). diff --git a/lang/python/python3/patches/014-remove-platform-so-suffix.patch b/lang/python/python3/patches/014-remove-platform-so-suffix.patch index 95009c2853..f0fa0246ef 100644 --- a/lang/python/python3/patches/014-remove-platform-so-suffix.patch +++ b/lang/python/python3/patches/014-remove-platform-so-suffix.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -15308,7 +15308,7 @@ $as_echo_n "checking ABIFLAGS... " >&6; +@@ -15366,7 +15366,7 @@ $as_echo_n "checking ABIFLAGS... " >&6; $as_echo "$ABIFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 $as_echo_n "checking SOABI... " >&6; } @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -4749,7 +4749,7 @@ AC_SUBST(SOABI) +@@ -4770,7 +4770,7 @@ AC_SUBST(SOABI) AC_MSG_CHECKING(ABIFLAGS) AC_MSG_RESULT($ABIFLAGS) AC_MSG_CHECKING(SOABI) diff --git a/lang/python/python3/patches/015-abort-on-failed-modules.patch b/lang/python/python3/patches/015-abort-on-failed-modules.patch index 033b9c6bfe..bd367a0a7b 100644 --- a/lang/python/python3/patches/015-abort-on-failed-modules.patch +++ b/lang/python/python3/patches/015-abort-on-failed-modules.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -536,6 +536,7 @@ class PyBuildExt(build_ext): +@@ -521,6 +521,7 @@ class PyBuildExt(build_ext): print("Failed to build these modules:") print_three_column(failed) print() diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch index 9104266340..8215892857 100644 --- a/lang/python/python3/patches/016-adjust-config-paths.patch +++ b/lang/python/python3/patches/016-adjust-config-paths.patch @@ -20,7 +20,7 @@ abi=sys.abiflags, --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1533,7 +1533,7 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1534,7 +1534,7 @@ libinstall: build_all $(srcdir)/Modules/ esac; \ done; \ done @@ -29,7 +29,7 @@ $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt ifeq (@COMPILE_ALL_TESTS@,yes) -@@ -1691,7 +1691,7 @@ sharedinstall: sharedmods +@@ -1692,7 +1692,7 @@ sharedinstall: sharedmods --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ @@ -49,7 +49,7 @@ fi elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 -@@ -15383,7 +15383,7 @@ fi +@@ -15441,7 +15441,7 @@ fi @@ -69,7 +69,7 @@ fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) -@@ -4812,7 +4812,7 @@ fi], +@@ -4833,7 +4833,7 @@ fi], dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) diff --git a/lang/python/python3/patches/024-musl-find_library.patch b/lang/python/python3/patches/024-musl-find_library.patch index 9ad33c05df..f986a7a94a 100644 --- a/lang/python/python3/patches/024-musl-find_library.patch +++ b/lang/python/python3/patches/024-musl-find_library.patch @@ -12,9 +12,9 @@ https://git.alpinelinux.org/aports/tree/main/python2/musl-find_library.patch + from glob import glob + musl_ldso = glob('/lib/ld-musl-*.so.1') - def _findLib_gcc(name): - # Run GCC's linker with the -t (aka --trace) option and examine the -@@ -252,6 +254,57 @@ elif os.name == "posix": + def _is_elf(filename): + "Return True if the given file is an ELF file" +@@ -265,6 +267,57 @@ elif os.name == "posix": def find_library(name, is64 = False): return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name)) diff --git a/lang/ruby/patches/100-musl.patch b/lang/ruby/patches/100-musl.patch index ce6a338091..29936cc1ae 100644 --- a/lang/ruby/patches/100-musl.patch +++ b/lang/ruby/patches/100-musl.patch @@ -10,7 +10,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -2344,7 +2344,10 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [ +@@ -2347,7 +2347,10 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [ rb_cv_coroutine=copy ], [*], [ diff --git a/libs/apr-util/patches/002-fix-gdbm-error-handling.patch b/libs/apr-util/patches/002-fix-gdbm-error-handling.patch index 92a4738e66..dabdbf84ea 100644 --- a/libs/apr-util/patches/002-fix-gdbm-error-handling.patch +++ b/libs/apr-util/patches/002-fix-gdbm-error-handling.patch @@ -1,7 +1,7 @@ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170 # needs to be submitted upstream ---- apr-util.orig/dbm/apr_dbm_gdbm.c -+++ apr-util/dbm/apr_dbm_gdbm.c +--- a/dbm/apr_dbm_gdbm.c ++++ b/dbm/apr_dbm_gdbm.c @@ -36,13 +36,22 @@ static apr_status_t g2s(int gerr) { diff --git a/libs/avahi/patches/010-pkgconfig.patch b/libs/avahi/patches/010-pkgconfig.patch index c03622deff..f5b6f7dfda 100644 --- a/libs/avahi/patches/010-pkgconfig.patch +++ b/libs/avahi/patches/010-pkgconfig.patch @@ -24,8 +24,6 @@ Signed-off-by: Rosen Penev avahi-ui.pc.in | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) -diff --git a/avahi-client.pc.in b/avahi-client.pc.in -index 65ee8d84..1e1bd249 100644 --- a/avahi-client.pc.in +++ b/avahi-client.pc.in @@ -1,6 +1,6 @@ @@ -37,8 +35,6 @@ index 65ee8d84..1e1bd249 100644 includedir=${prefix}/include Name: avahi-client -diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in -index b3cd02a7..1bb42c6b 100644 --- a/avahi-compat-howl.pc.in +++ b/avahi-compat-howl.pc.in @@ -1,6 +1,6 @@ @@ -50,8 +46,6 @@ index b3cd02a7..1bb42c6b 100644 includedir=${prefix}/include/avahi-compat-howl/ Name: avahi-compat-howl -diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in -index d6196325..d4778a17 100644 --- a/avahi-compat-libdns_sd.pc.in +++ b/avahi-compat-libdns_sd.pc.in @@ -1,6 +1,6 @@ @@ -63,8 +57,6 @@ index d6196325..d4778a17 100644 includedir=${prefix}/include/avahi-compat-libdns_sd/ Name: avahi-compat-libdns_sd -diff --git a/avahi-core.pc.in b/avahi-core.pc.in -index 52491b41..73412d45 100644 --- a/avahi-core.pc.in +++ b/avahi-core.pc.in @@ -1,6 +1,6 @@ @@ -76,8 +68,6 @@ index 52491b41..73412d45 100644 includedir=${prefix}/include Name: avahi-core -diff --git a/avahi-glib.pc.in b/avahi-glib.pc.in -index f163e899..3d0ff9fc 100644 --- a/avahi-glib.pc.in +++ b/avahi-glib.pc.in @@ -1,6 +1,6 @@ @@ -89,8 +79,6 @@ index f163e899..3d0ff9fc 100644 includedir=${prefix}/include Name: avahi-glib -diff --git a/avahi-gobject.pc.in b/avahi-gobject.pc.in -index bf382003..88146744 100644 --- a/avahi-gobject.pc.in +++ b/avahi-gobject.pc.in @@ -1,6 +1,6 @@ @@ -102,8 +90,6 @@ index bf382003..88146744 100644 includedir=${prefix}/include Name: avahi-gobject -diff --git a/avahi-libevent.pc.in b/avahi-libevent.pc.in -index a1dca01b..59b35e8e 100644 --- a/avahi-libevent.pc.in +++ b/avahi-libevent.pc.in @@ -1,6 +1,6 @@ @@ -115,8 +101,6 @@ index a1dca01b..59b35e8e 100644 includedir=${prefix}/include Name: avahi-libevent -diff --git a/avahi-qt3.pc.in b/avahi-qt3.pc.in -index c18f0809..d4fb4b88 100644 --- a/avahi-qt3.pc.in +++ b/avahi-qt3.pc.in @@ -1,6 +1,6 @@ @@ -128,8 +112,6 @@ index c18f0809..d4fb4b88 100644 includedir=${prefix}/include Name: avahi-qt3 -diff --git a/avahi-qt4.pc.in b/avahi-qt4.pc.in -index f62f7171..aefc135a 100644 --- a/avahi-qt4.pc.in +++ b/avahi-qt4.pc.in @@ -1,6 +1,6 @@ @@ -141,8 +123,6 @@ index f62f7171..aefc135a 100644 includedir=${prefix}/include Name: avahi-qt4 -diff --git a/avahi-qt5.pc.in b/avahi-qt5.pc.in -index 71548baf..fffe192a 100644 --- a/avahi-qt5.pc.in +++ b/avahi-qt5.pc.in @@ -1,6 +1,6 @@ @@ -154,8 +134,6 @@ index 71548baf..fffe192a 100644 includedir=${prefix}/include Name: avahi-qt5 -diff --git a/avahi-sharp.pc.in b/avahi-sharp.pc.in -index 3cc78b60..4d4c15df 100644 --- a/avahi-sharp.pc.in +++ b/avahi-sharp.pc.in @@ -1,6 +1,6 @@ @@ -166,8 +144,6 @@ index 3cc78b60..4d4c15df 100644 Name: avahi-sharp Description: Mono bindings for the Avahi mDNS/DNS-SD stack -diff --git a/avahi-ui-gtk3.pc.in b/avahi-ui-gtk3.pc.in -index 27c4322d..56159481 100644 --- a/avahi-ui-gtk3.pc.in +++ b/avahi-ui-gtk3.pc.in @@ -1,6 +1,6 @@ @@ -179,8 +155,6 @@ index 27c4322d..56159481 100644 includedir=${prefix}/include Name: avahi-ui -diff --git a/avahi-ui-sharp.pc.in b/avahi-ui-sharp.pc.in -index cdc35e0d..d448b241 100644 --- a/avahi-ui-sharp.pc.in +++ b/avahi-ui-sharp.pc.in @@ -1,6 +1,6 @@ @@ -191,8 +165,6 @@ index cdc35e0d..d448b241 100644 Name: avahi-ui-sharp Description: Mono bindings for the Avahi mDNS/DNS-SD stack -diff --git a/avahi-ui.pc.in b/avahi-ui.pc.in -index 9edeea96..0dab729a 100644 --- a/avahi-ui.pc.in +++ b/avahi-ui.pc.in @@ -1,6 +1,6 @@ diff --git a/libs/avahi/patches/100-p2p-no-iff_multicast-required.patch b/libs/avahi/patches/100-p2p-no-iff_multicast-required.patch index 45aace5e1e..11a0dc7a24 100644 --- a/libs/avahi/patches/100-p2p-no-iff_multicast-required.patch +++ b/libs/avahi/patches/100-p2p-no-iff_multicast-required.patch @@ -6,11 +6,9 @@ Date: Thu Sep 17 00:27:55 2020 +0000 Signed-off-by: Philip Prindeville -diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c -index e116c7b..75089c4 100644 --- a/avahi-core/iface-linux.c +++ b/avahi-core/iface-linux.c -@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat +@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlin (ifinfomsg->ifi_flags & IFF_UP) && (!m->server->config.use_iff_running || (ifinfomsg->ifi_flags & IFF_RUNNING)) && ((ifinfomsg->ifi_flags & IFF_LOOPBACK) || @@ -21,11 +19,9 @@ index e116c7b..75089c4 100644 /* Handle interface attributes */ l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg)); -diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c -index 45fd970..4eafce0 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi-core/iface-pfroute.c -@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) +@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *r (ifm->ifm_flags & IFF_UP) && (!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) && ((ifm->ifm_flags & IFF_LOOPBACK) || @@ -36,7 +32,7 @@ index 45fd970..4eafce0 100644 avahi_free(hw->name); hw->name = avahi_strndup(sdl->sdl_data, sdl->sdl_nlen); -@@ -428,8 +428,8 @@ static void if_add_interface(struct lifreq *lifreq, AvahiInterfaceMonitor *m, in +@@ -428,8 +428,8 @@ static void if_add_interface(struct lifr (flags & IFF_UP) && (!m->server->config.use_iff_running || (flags & IFF_RUNNING)) && ((flags & IFF_LOOPBACK) || diff --git a/libs/flac/patches/010-utime.patch b/libs/flac/patches/010-utime.patch index 0c1d170247..cc077aff72 100644 --- a/libs/flac/patches/010-utime.patch +++ b/libs/flac/patches/010-utime.patch @@ -22,8 +22,6 @@ This fixes flac_utime to work in such a situation. src/share/grabbag/file.c | 9 +++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) -diff --git a/include/share/compat.h b/include/share/compat.h -index f3041655..a063c083 100644 --- a/include/share/compat.h +++ b/include/share/compat.h @@ -112,9 +112,13 @@ @@ -57,11 +55,9 @@ index f3041655..a063c083 100644 #endif #ifdef _WIN32 -diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c -index 352a6c7a..d5255eb9 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c -@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stats) +@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *f void set_file_stats_(const char *filename, struct flac_stat_s *stats) { @@ -82,8 +78,6 @@ index 352a6c7a..d5255eb9 100644 (void)flac_chmod(filename, stats->st_mode); (void)flac_utime(filename, &srctime); #if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ -diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c -index 2c67bebf..edd835a6 100644 --- a/src/share/grabbag/file.c +++ b/src/share/grabbag/file.c @@ -27,7 +27,6 @@ @@ -113,6 +107,3 @@ index 2c67bebf..edd835a6 100644 (void)flac_chmod(destpath, srcstat.st_mode); (void)flac_utime(destpath, &srctime); } --- -2.17.1 - diff --git a/libs/getdns/patches/020-openssl-no-dynamic.patch b/libs/getdns/patches/020-openssl-no-dynamic.patch index 88318d5057..57824dab89 100644 --- a/libs/getdns/patches/020-openssl-no-dynamic.patch +++ b/libs/getdns/patches/020-openssl-no-dynamic.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OPENSSL_ERR_H) +@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OP check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H) check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H) check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H) diff --git a/libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch b/libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch index 71b5a0d10a..d8d94ac4d9 100644 --- a/libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch +++ b/libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 2020-07-01 00:06:07.784792469 +0100 -+++ b/CMakeLists.txt 2020-07-01 00:07:09.232511018 +0100 -@@ -520,7 +520,7 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -523,7 +523,7 @@ set(STRPTIME_TEST_SOURCE "\n res = strptime(\"20070207111842\", \"%Y%m%d%H%M%S\", &tm);\n if (!res) return 1; return 0; }") diff --git a/libs/h2o/patches/100-socket_disable_npn.patch b/libs/h2o/patches/100-socket_disable_npn.patch index 00425e8d3a..d3f9c71698 100644 --- a/libs/h2o/patches/100-socket_disable_npn.patch +++ b/libs/h2o/patches/100-socket_disable_npn.patch @@ -1,6 +1,6 @@ --- a/include/h2o/socket.h +++ b/include/h2o/socket.h -@@ -29,6 +29,7 @@ +@@ -29,6 +29,7 @@ extern "C" { #include #include #include @@ -8,7 +8,7 @@ #include "h2o/cache.h" #include "h2o/memory.h" #include "h2o/openssl_backport.h" -@@ -45,7 +44,11 @@ +@@ -44,7 +45,11 @@ extern "C" { #if OPENSSL_VERSION_NUMBER >= 0x10002000L #define H2O_USE_ALPN 1 diff --git a/libs/h2o/patches/200-libh2o-evloop_wslay-link.patch b/libs/h2o/patches/200-libh2o-evloop_wslay-link.patch index 3b0a85fbfd..d15a6b3e9a 100644 --- a/libs/h2o/patches/200-libh2o-evloop_wslay-link.patch +++ b/libs/h2o/patches/200-libh2o-evloop_wslay-link.patch @@ -15,11 +15,9 @@ Signed-off-by: James Taylor CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a68613081..13c2f8a9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -519,13 +519,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES +@@ -386,13 +386,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES OUTPUT_NAME h2o VERSION ${LIBRARY_VERSION} SOVERSION ${LIBRARY_SOVERSION}) @@ -41,5 +39,5 @@ index a68613081..13c2f8a9f 100644 + TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) +ENDIF (WSLAY_FOUND) - TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR}) - TARGET_INCLUDE_DIRECTORIES(libh2o-evloop PUBLIC ${OPENSSL_INCLUDE_DIR}) + IF (OPENSSL_FOUND) + TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR}) diff --git a/libs/h2o/patches/400-backtrace-detection.patch b/libs/h2o/patches/400-backtrace-detection.patch index c32edfc53d..d74937f17b 100644 --- a/libs/h2o/patches/400-backtrace-detection.patch +++ b/libs/h2o/patches/400-backtrace-detection.patch @@ -8,8 +8,6 @@ Subject: [PATCH] Autodetect backtrace and backtrace_symbols_fd src/main.c | 10 ++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index abfab1f19..2a26fb98a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,19 @@ __sync_add_and_fetch(&a, 1); @@ -32,8 +30,6 @@ index abfab1f19..2a26fb98a 100644 SET(WITH_BUNDLED_SSL_DEFAULT "ON") IF ((NOT UNIX) OR CYGWIN) SET(WITH_BUNDLED_SSL_DEFAULT "OFF") -diff --git a/src/main.c b/src/main.c -index 7c346af18..edc7d5eb3 100644 --- a/src/main.c +++ b/src/main.c @@ -48,7 +48,7 @@ @@ -45,7 +41,7 @@ index 7c346af18..edc7d5eb3 100644 #include #endif #if H2O_USE_PICOTLS -@@ -1435,7 +1435,8 @@ static void on_sigterm(int signo) +@@ -1436,7 +1436,8 @@ static void on_sigterm(int signo) notify_all_threads(); } @@ -55,7 +51,7 @@ index 7c346af18..edc7d5eb3 100644 static int popen_crash_handler(void) { char *cmd_fullpath = h2o_configurator_get_cmd_path(conf.crash_handler), *argv[] = {cmd_fullpath, NULL}; -@@ -1487,13 +1488,14 @@ static void on_sigfatal(int signo) +@@ -1488,13 +1489,14 @@ static void on_sigfatal(int signo) raise(signo); } diff --git a/libs/h2o/patches/500-openssl.patch b/libs/h2o/patches/500-openssl.patch index a9c2fd8343..609077ee23 100644 --- a/libs/h2o/patches/500-openssl.patch +++ b/libs/h2o/patches/500-openssl.patch @@ -18,7 +18,7 @@ #include #include #include -@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src, +@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buf Exit: if (cctx != NULL) @@ -27,7 +27,7 @@ if (hctx != NULL) HMAC_CTX_free(hctx); return ret; -@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src, +@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buf Exit: if (cctx != NULL) @@ -46,7 +46,7 @@ #include #include #include -@@ -1825,7 +1826,7 @@ static h2o_iovec_t on_extra_status(void *unused, h2o_globalconf_t *_conf, h2o_re +@@ -1827,7 +1828,7 @@ static h2o_iovec_t on_extra_status(void " \"listeners\": %zu,\n" " \"worker-threads\": %zu,\n" " \"num-sessions\": %lu", @@ -55,7 +55,7 @@ num_connections(0), conf.max_connections, conf.num_listeners, conf.num_threads, num_sessions(0)); assert(ret.len < BUFSIZE); -@@ -2006,7 +2007,7 @@ int main(int argc, char **argv) +@@ -2008,7 +2009,7 @@ int main(int argc, char **argv) break; case 'v': printf("h2o version " H2O_VERSION "\n"); @@ -66,7 +66,7 @@ "mruby: YES\n"); /* TODO determine the way to obtain the version of mruby (that is being linked dynamically) */ --- a/src/ssl.c +++ b/src/ssl.c -@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CTX **contexts, size_t num_contexts) +@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CT #endif } @@ -74,7 +74,7 @@ static pthread_mutex_t *mutexes; static void lock_callback(int mode, int n, const char *file, int line) -@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, int amount, int type, const char *file, i +@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, i return __sync_add_and_fetch(num, amount); } diff --git a/libs/h2o/patches/600-engine.patch b/libs/h2o/patches/600-engine.patch index f36fa3b899..90f677d97b 100644 --- a/libs/h2o/patches/600-engine.patch +++ b/libs/h2o/patches/600-engine.patch @@ -1,6 +1,6 @@ --- a/deps/neverbleed/neverbleed.c +++ b/deps/neverbleed/neverbleed.c -@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf) +@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, ch close(pipe_fds[0]); pipe_fds[0] = -1; @@ -8,7 +8,7 @@ /* setup engine */ if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") || !ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method) -@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf) +@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, ch goto Fail; } ENGINE_add(nb->engine); diff --git a/libs/ibrcommon/patches/001-fix-build-with-musl.patch b/libs/ibrcommon/patches/001-fix-build-with-musl.patch index 0d3f9c2398..c7b9a8c358 100644 --- a/libs/ibrcommon/patches/001-fix-build-with-musl.patch +++ b/libs/ibrcommon/patches/001-fix-build-with-musl.patch @@ -1,5 +1,3 @@ -diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp -index 31af4ae..9b49890 100644 --- a/ibrcommon/data/File.cpp +++ b/ibrcommon/data/File.cpp @@ -35,9 +35,7 @@ diff --git a/libs/ibrcommon/patches/010-build-with-openssl-1.1.patch b/libs/ibrcommon/patches/010-build-with-openssl-1.1.patch index c987e197e8..559d17a6e5 100644 --- a/libs/ibrcommon/patches/010-build-with-openssl-1.1.patch +++ b/libs/ibrcommon/patches/010-build-with-openssl-1.1.patch @@ -16,8 +16,6 @@ Signed-off-by: Eneas U de Queiroz 6 files changed, 95 insertions(+), 30 deletions(-) create mode 100644 ibrcommon/ssl/openssl_compat.h -diff --git a/ibrcommon/ssl/HMacStream.cpp b/ibrcommon/ssl/HMacStream.cpp -index e5d317e3..66d8ce42 100644 --- a/ibrcommon/ssl/HMacStream.cpp +++ b/ibrcommon/ssl/HMacStream.cpp @@ -20,29 +20,30 @@ @@ -56,8 +54,6 @@ index e5d317e3..66d8ce42 100644 + HMAC_Final(ctx_, (unsigned char*)hash, &size); } } -diff --git a/ibrcommon/ssl/HMacStream.h b/ibrcommon/ssl/HMacStream.h -index 7dcea168..d04bceb8 100644 --- a/ibrcommon/ssl/HMacStream.h +++ b/ibrcommon/ssl/HMacStream.h @@ -44,7 +44,7 @@ namespace ibrcommon @@ -69,8 +65,6 @@ index 7dcea168..d04bceb8 100644 }; } -diff --git a/ibrcommon/ssl/RSASHA256Stream.cpp b/ibrcommon/ssl/RSASHA256Stream.cpp -index d94430ed..d25c5d2f 100644 --- a/ibrcommon/ssl/RSASHA256Stream.cpp +++ b/ibrcommon/ssl/RSASHA256Stream.cpp @@ -21,6 +21,7 @@ @@ -174,8 +168,6 @@ index d94430ed..d25c5d2f 100644 { IBRCOMMON_LOGGER_TAG("RSASHA256Stream", critical) << "failed to feed data into the verification function" << IBRCOMMON_LOGGER_ENDL; ERR_print_errors_fp(stderr); -diff --git a/ibrcommon/ssl/RSASHA256Stream.h b/ibrcommon/ssl/RSASHA256Stream.h -index 344f8e10..6f3a1168 100644 --- a/ibrcommon/ssl/RSASHA256Stream.h +++ b/ibrcommon/ssl/RSASHA256Stream.h @@ -106,7 +106,7 @@ namespace ibrcommon @@ -187,8 +179,6 @@ index 344f8e10..6f3a1168 100644 /** tells if the context needs to be finalized to get a valid signature or verification */ -diff --git a/ibrcommon/ssl/iostreamBIO.cpp b/ibrcommon/ssl/iostreamBIO.cpp -index 18c1b55c..ea6c63eb 100644 --- a/ibrcommon/ssl/iostreamBIO.cpp +++ b/ibrcommon/ssl/iostreamBIO.cpp @@ -23,6 +23,7 @@ @@ -240,7 +230,7 @@ index 18c1b55c..ea6c63eb 100644 if(!_bio){ /* creation failed, throw exception */ char err_buf[ERR_BUF_SIZE]; -@@ -72,7 +91,7 @@ iostreamBIO::iostreamBIO(iostream *stream) +@@ -72,7 +91,7 @@ iostreamBIO::iostreamBIO(iostream *strea } /* save the iostream in the bio object */ @@ -281,7 +271,7 @@ index 18c1b55c..ea6c63eb 100644 IBRCOMMON_LOGGER_DEBUG_TAG("iostreamBIO", 90) << "ctrl called, cmd: " << cmd << ", num: " << num << "." << IBRCOMMON_LOGGER_ENDL; -@@ -147,8 +167,12 @@ static long ctrl(BIO *bio, int cmd, long num, void *) +@@ -147,8 +167,12 @@ static long ctrl(BIO *bio, int cmd, long static int bread(BIO *bio, char *buf, int len) { @@ -295,7 +285,7 @@ index 18c1b55c..ea6c63eb 100644 try{ /* make sure to read at least 1 byte and then read as much as we can */ -@@ -170,7 +194,7 @@ static int bwrite(BIO *bio, const char *buf, int len) +@@ -170,7 +194,7 @@ static int bwrite(BIO *bio, const char * if(len == 0){ return 0; } @@ -304,9 +294,6 @@ index 18c1b55c..ea6c63eb 100644 /* write the data */ try{ -diff --git a/ibrcommon/ssl/openssl_compat.h b/ibrcommon/ssl/openssl_compat.h -new file mode 100644 -index 00000000..e491677f --- /dev/null +++ b/ibrcommon/ssl/openssl_compat.h @@ -0,0 +1,38 @@ @@ -348,6 +335,3 @@ index 00000000..e491677f + +#endif /* OPENSSL_COMPAT_H */ + --- -2.16.1 - diff --git a/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch b/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch index fe535089a1..1fcec0b971 100644 --- a/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch +++ b/libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch @@ -9,8 +9,6 @@ the algorithm implemenetations. ibrdtn/data/Bundle.h | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/ibrdtn/data/Bundle.h b/ibrdtn/data/Bundle.h -index 036a2a6fb..9bbc066d7 100644 --- a/ibrdtn/data/Bundle.h +++ b/ibrdtn/data/Bundle.h @@ -69,6 +69,9 @@ namespace dtn diff --git a/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch b/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch index d1e2c588d4..d585f3b752 100644 --- a/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch +++ b/libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Use const iterator in const function of MemoryBundleSet ibrdtn/data/MemoryBundleSet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/ibrdtn/data/MemoryBundleSet.cpp b/ibrdtn/data/MemoryBundleSet.cpp -index 987342e6d..b67fdd393 100644 --- a/ibrdtn/data/MemoryBundleSet.cpp +++ b/ibrdtn/data/MemoryBundleSet.cpp @@ -134,7 +134,7 @@ namespace dtn diff --git a/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch b/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch index 0e29a132ef..8c9ac77fd2 100644 --- a/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch +++ b/libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch @@ -8,8 +8,6 @@ Subject: [PATCH] Use std::streamoff instead of std::streampos ibrdtn/data/Dictionary.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/ibrdtn/data/BundleMerger.cpp b/ibrdtn/data/BundleMerger.cpp -index 1cd20c522..b71a0849b 100644 --- a/ibrdtn/data/BundleMerger.cpp +++ b/ibrdtn/data/BundleMerger.cpp @@ -119,7 +119,7 @@ namespace dtn @@ -21,8 +19,6 @@ index 1cd20c522..b71a0849b 100644 const dtn::data::PayloadBlock &p = obj.find(); const Length plength = p.getLength(); -diff --git a/ibrdtn/data/Dictionary.cpp b/ibrdtn/data/Dictionary.cpp -index 6299e66f3..208f90488 100644 --- a/ibrdtn/data/Dictionary.cpp +++ b/ibrdtn/data/Dictionary.cpp @@ -154,11 +154,11 @@ namespace dtn diff --git a/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch b/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch index df9f27f1a8..2f56111110 100644 --- a/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch +++ b/libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch @@ -11,8 +11,6 @@ Signed-off-by: Rosen Penev ibrdtn/data/Bundle.h | 2 ++ 2 files changed, 12 insertions(+) -diff --git a/ibrdtn/data/Bundle.cpp b/ibrdtn/data/Bundle.cpp -index f515860..943544e 100644 --- a/ibrdtn/data/Bundle.cpp +++ b/ibrdtn/data/Bundle.cpp @@ -71,11 +71,21 @@ namespace dtn @@ -37,8 +35,6 @@ index f515860..943544e 100644 bool Bundle::operator!=(const Bundle& other) const { return (const PrimaryBlock&)(*this) != (const PrimaryBlock&)other; -diff --git a/ibrdtn/data/Bundle.h b/ibrdtn/data/Bundle.h -index 9bbc066..6a4ea47 100644 --- a/ibrdtn/data/Bundle.h +++ b/ibrdtn/data/Bundle.h @@ -97,7 +97,9 @@ namespace dtn diff --git a/libs/ipfs-http-client/patches/001-add-srv-addr.patch b/libs/ipfs-http-client/patches/001-add-srv-addr.patch index 21ff746421..cec764ec52 100644 --- a/libs/ipfs-http-client/patches/001-add-srv-addr.patch +++ b/libs/ipfs-http-client/patches/001-add-srv-addr.patch @@ -1,6 +1,6 @@ ---- a/test/block.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/block.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -24,9 +24,16 @@ +--- a/test/block.cc ++++ b/test/block.cc +@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -19,9 +19,9 @@ /** [ipfs::Client::BlockPut] */ ipfs::Json block; ---- a/test/config.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/config.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -23,9 +23,16 @@ +--- a/test/config.cc ++++ b/test/config.cc +@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -40,9 +40,9 @@ /** [ipfs::Client::ConfigSet] */ client.ConfigSet("Datastore.StorageMax", "20GB"); ---- a/test/dht.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/dht.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -23,9 +23,16 @@ +--- a/test/dht.cc ++++ b/test/dht.cc +@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -61,9 +61,9 @@ ipfs::Json add_result; client.FilesAdd( ---- a/test/error.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/error.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -35,16 +35,23 @@ +--- a/test/error.cc ++++ b/test/error.cc +@@ -35,16 +35,23 @@ extern std::string replace_body; } } // namespace ipfs @@ -90,9 +90,9 @@ std::string object_id; client.ObjectNew(&object_id); ---- a/test/files.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/files.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -24,9 +24,16 @@ +--- a/test/files.cc ++++ b/test/files.cc +@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -111,9 +111,9 @@ /** [ipfs::Client::FilesGet] */ std::stringstream contents; ---- a/test/generic.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/generic.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -24,16 +24,23 @@ +--- a/test/generic.cc ++++ b/test/generic.cc +@@ -24,16 +24,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -140,9 +140,9 @@ clientC = std::move(clientB); #pragma GCC diagnostic push ---- a/test/key.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/key.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -26,9 +26,16 @@ +--- a/test/key.cc ++++ b/test/key.cc +@@ -26,9 +26,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE using Json = nlohmann::json; @@ -161,9 +161,9 @@ /** [ipfs::Client::KeyGen] */ std::string key_id; ---- a/test/name.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/name.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -24,9 +24,16 @@ +--- a/test/name.cc ++++ b/test/name.cc +@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -182,9 +182,9 @@ // We need a key here, so as not to clobber the "self" key. std::string key_id; ---- a/test/object.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/object.cc 2019-11-22 18:16:58.245249328 +0300 -@@ -24,9 +24,16 @@ +--- a/test/object.cc ++++ b/test/object.cc +@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -203,9 +203,9 @@ /** [ipfs::Client::ObjectNew] */ std::string object_id; ---- a/test/pin.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/pin.cc 2019-11-23 23:09:57.507400418 +0300 -@@ -23,9 +23,16 @@ +--- a/test/pin.cc ++++ b/test/pin.cc +@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include @@ -224,9 +224,9 @@ std::string object_id; ---- a/test/swarm.cc 2019-11-22 18:16:53.973272202 +0300 -+++ b/test/swarm.cc 2019-11-23 23:10:07.199342933 +0300 -@@ -23,9 +23,16 @@ +--- a/test/swarm.cc ++++ b/test/swarm.cc +@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE #include #include diff --git a/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch b/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch index 5075760381..7639aca232 100644 --- a/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch +++ b/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Fix minor FILE* leak cmd/jwe/pwd.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/cmd/jwe/pwd.h b/cmd/jwe/pwd.h -index 0b5be54..2f021eb 100644 --- a/cmd/jwe/pwd.h +++ b/cmd/jwe/pwd.h @@ -57,8 +57,10 @@ jwe_getpass(const char *prompt) diff --git a/libs/jose/patches/020-openssl-deprecated.patch b/libs/jose/patches/020-openssl-deprecated.patch index bcee0dfadb..7ae664bca5 100644 --- a/libs/jose/patches/020-openssl-deprecated.patch +++ b/libs/jose/patches/020-openssl-deprecated.patch @@ -10,7 +10,7 @@ #include --- a/lib/openssl/misc.c +++ b/lib/openssl/misc.c -@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, const char *plural, ...) +@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, co static void __attribute__((constructor)) constructor(void) { diff --git a/libs/ldns/patches/001-compile-for-darwin.patch b/libs/ldns/patches/001-compile-for-darwin.patch index 3449d86096..68c44dae54 100644 --- a/libs/ldns/patches/001-compile-for-darwin.patch +++ b/libs/ldns/patches/001-compile-for-darwin.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([--with-xcode-sdk], +@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([- [],[with_xcode_sdk="yes"]) if test "x_$with_xcode_sdk" != "x_no" ; then # check OSX deployment target, if needed diff --git a/libs/ldns/patches/010-openssl-deprecated.patch b/libs/ldns/patches/010-openssl-deprecated.patch index eed21e0fb3..f5d92d2ce4 100644 --- a/libs/ldns/patches/010-openssl-deprecated.patch +++ b/libs/ldns/patches/010-openssl-deprecated.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Fix compilation without deprecated APIs keys.c | 1 + 3 files changed, 5 insertions(+) -diff --git a/dnssec_verify.c b/dnssec_verify.c -index d22962eb..99a7515d 100644 --- a/dnssec_verify.c +++ b/dnssec_verify.c -@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE *out, +@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE if (tree->parent_status[i] == LDNS_STATUS_SSL_ERR) { printf("; SSL Error: "); @@ -23,8 +21,6 @@ index d22962eb..99a7515d 100644 ERR_print_errors_fp(stdout); printf("\n"); } -diff --git a/drill/drill.c b/drill/drill.c -index 6efd29a5..186bdff2 100644 --- a/drill/drill.c +++ b/drill/drill.c @@ -994,10 +994,12 @@ main(int argc, char *argv[]) @@ -40,8 +36,6 @@ index 6efd29a5..186bdff2 100644 #ifdef USE_WINSOCK WSACleanup(); #endif -diff --git a/keys.c b/keys.c -index 016f9731..06afb739 100644 --- a/keys.c +++ b/keys.c @@ -15,6 +15,7 @@ diff --git a/libs/ldns/patches/020-openssl-dsa.patch b/libs/ldns/patches/020-openssl-dsa.patch index ee02a0a89a..fc95e1a1a9 100644 --- a/libs/ldns/patches/020-openssl-dsa.patch +++ b/libs/ldns/patches/020-openssl-dsa.patch @@ -16,11 +16,9 @@ Signed-off-by: Rosen Penev rr_functions.c | 4 ++++ 9 files changed, 51 insertions(+), 3 deletions(-) -diff --git a/dnssec.c b/dnssec.c -index 482cefd6..71508600 100644 --- a/dnssec.c +++ b/dnssec.c -@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint8_t* key, size_t keysize) +@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint } #ifdef HAVE_SSL @@ -28,7 +26,7 @@ index 482cefd6..71508600 100644 DSA * ldns_key_buf2dsa(const ldns_buffer *key) { -@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t len) +@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char #endif /* OPENSSL_VERSION_NUMBER */ return dsa; } @@ -36,8 +34,6 @@ index 482cefd6..71508600 100644 RSA * ldns_key_buf2rsa(const ldns_buffer *key) -diff --git a/examples/ldns-dane.c b/examples/ldns-dane.c -index 4c31fd8f..7b33ad18 100644 --- a/examples/ldns-dane.c +++ b/examples/ldns-dane.c @@ -1680,9 +1680,11 @@ main(int argc, char* const* argv) @@ -52,8 +48,6 @@ index 4c31fd8f..7b33ad18 100644 /* ssl load validation store */ if (! assume_pkix_validity || CAfile || CApath) { -diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c -index 62b8d228..237016e5 100644 --- a/examples/ldns-keygen.c +++ b/examples/ldns-keygen.c @@ -148,6 +148,7 @@ main(int argc, char *argv[]) @@ -72,8 +66,6 @@ index 62b8d228..237016e5 100644 #ifdef USE_GOST case LDNS_SIGN_ECC_GOST: if(!ldns_key_EVP_load_gost_id()) { -diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c -index 7d24ad90..abae352a 100644 --- a/examples/ldns-signzone.c +++ b/examples/ldns-signzone.c @@ -72,10 +72,14 @@ usage(FILE *fp, const char *prog) { @@ -107,7 +99,7 @@ index 7d24ad90..abae352a 100644 __MATCH ( ECC_GOST ); __MATCH ( ECDSAP256SHA256 ); __MATCH ( ECDSAP384SHA384 ); -@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE * const e ) +@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE case LDNS_SIGN_RSASHA1_NSEC3: case LDNS_SIGN_RSASHA256: case LDNS_SIGN_RSASHA512: @@ -132,21 +124,20 @@ index 7d24ad90..abae352a 100644 } #endif exit(EXIT_FAILURE); -@@ -1018,7 +1032,9 @@ main(int argc, char *argv[]) +@@ -1018,8 +1032,10 @@ main(int argc, char *argv[]) #ifndef OPENSSL_NO_ENGINE shutdown_openssl ( engine ); #else +#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL) CRYPTO_cleanup_all_ex_data(); -+#endif #endif ++#endif free(prog); -diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c -index c17bd21c..a5a1d003 100644 + exit(EXIT_SUCCESS); --- a/examples/ldns-verify-zone.c +++ b/examples/ldns-verify-zone.c -@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns_rr* rr, ldns_status status) +@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns if (status != LDNS_STATUS_OK) { print_rr_error(stream, rr, ldns_get_errorstr_by_id(status)); if (verbosity > 0 && status == LDNS_STATUS_SSL_ERR) { @@ -156,8 +147,6 @@ index c17bd21c..a5a1d003 100644 ERR_print_errors_fp(stream); } } -diff --git a/host2str.c b/host2str.c -index 3ca23c20..29a5f5c9 100644 --- a/host2str.c +++ b/host2str.c @@ -49,10 +49,14 @@ @@ -175,7 +164,7 @@ index 3ca23c20..29a5f5c9 100644 { LDNS_RSASHA1_NSEC3, "RSASHA1-NSEC3-SHA1" }, #ifdef USE_SHA2 { LDNS_RSASHA256, "RSASHA256"}, -@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) +@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output, unsigned char *bignum; #ifdef HAVE_SSL RSA *rsa; @@ -185,7 +174,7 @@ index 3ca23c20..29a5f5c9 100644 #endif /* HAVE_SSL */ if (!k) { -@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) +@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output, RSA_free(rsa); break; @@ -193,7 +182,7 @@ index 3ca23c20..29a5f5c9 100644 case LDNS_SIGN_DSA: case LDNS_SIGN_DSA_NSEC3: dsa = ldns_key_dsa_key(k); -@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k) +@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output, goto error; } break; @@ -201,11 +190,9 @@ index 3ca23c20..29a5f5c9 100644 case LDNS_SIGN_ECC_GOST: /* no format defined, use blob */ #if defined(HAVE_SSL) && defined(USE_GOST) -diff --git a/keys.c b/keys.c -index 06afb739..ddff6f35 100644 --- a/keys.c +++ b/keys.c -@@ -905,6 +905,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr) +@@ -905,6 +905,7 @@ error: return NULL; } @@ -213,7 +200,7 @@ index 06afb739..ddff6f35 100644 DSA * ldns_key_new_frm_fp_dsa(FILE *f) { -@@ -1015,6 +1016,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr)) +@@ -1015,6 +1016,7 @@ error: BN_free(pub_key); return NULL; } @@ -221,7 +208,7 @@ index 06afb739..ddff6f35 100644 unsigned char * ldns_key_new_frm_fp_hmac(FILE *f, size_t *hmac_size) -@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_algorithm alg, uint16_t size) +@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_ #endif /* HAVE_EVP_PKEY_KEYGEN */ #endif /* HAVE_SSL */ break; @@ -256,7 +243,7 @@ index 06afb739..ddff6f35 100644 #ifdef HAVE_SSL dsa = ldns_key_dsa_key(k); if (dsa) { -@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_algorithm_by_name(const char* name) +@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_ ldns_lookup_table aliases[] = { /* from bind dnssec-keygen */ {LDNS_SIGN_HMACMD5, "HMAC-MD5"}, @@ -266,8 +253,6 @@ index 06afb739..ddff6f35 100644 {LDNS_SIGN_RSASHA1_NSEC3, "NSEC3RSASHA1"}, /* old ldns usage, now RFC names */ #ifdef USE_DSA -diff --git a/ldns/keys.h b/ldns/keys.h -index df4bb22b..826f876f 100644 --- a/ldns/keys.h +++ b/ldns/keys.h @@ -45,10 +45,14 @@ enum ldns_enum_algorithm @@ -301,11 +286,9 @@ index df4bb22b..826f876f 100644 LDNS_SIGN_ECC_GOST = LDNS_ECC_GOST, LDNS_SIGN_ECDSAP256SHA256 = LDNS_ECDSAP256SHA256, LDNS_SIGN_ECDSAP384SHA384 = LDNS_ECDSAP384SHA384, -diff --git a/rr_functions.c b/rr_functions.c -index 20a0bfaa..8d72696b 100644 --- a/rr_functions.c +++ b/rr_functions.c -@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsigned char* keydata, +@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsign const size_t len, const ldns_algorithm alg) { @@ -323,7 +306,7 @@ index 20a0bfaa..8d72696b 100644 case LDNS_SIGN_DSA: case LDNS_SIGN_DSA_NSEC3: if (len > 0) { -@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsigned char* keydata, +@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsign return 0; } break; diff --git a/libs/ldns/patches/030-signzone.patch b/libs/ldns/patches/030-signzone.patch index f001ab8570..b9ef8fe5fb 100644 --- a/libs/ldns/patches/030-signzone.patch +++ b/libs/ldns/patches/030-signzone.patch @@ -1,6 +1,6 @@ --- a/examples/ldns-signzone.c +++ b/examples/ldns-signzone.c -@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const id ) +@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const static void shutdown_openssl ( ENGINE * const e ) { diff --git a/libs/libaio/patches/004_arches_x32.patch b/libs/libaio/patches/004_arches_x32.patch index 75d3566cf6..22d3d9b8a0 100644 --- a/libs/libaio/patches/004_arches_x32.patch +++ b/libs/libaio/patches/004_arches_x32.patch @@ -13,7 +13,7 @@ Last-Update: 2013-05-06 --- a/src/syscall-x86_64.h +++ b/src/syscall-x86_64.h -@@ -1,5 +1,15 @@ +@@ -1,6 +1,16 @@ +#ifndef __NR_io_setup #define __NR_io_setup 206 +#endif @@ -29,6 +29,7 @@ Last-Update: 2013-05-06 +#ifndef __NR_io_cancel #define __NR_io_cancel 210 +#endif + #define __NR_io_pgetevents 333 --- a/harness/main.c +++ b/harness/main.c @@ -14,7 +14,7 @@ diff --git a/libs/libcap/patches/300-disable-tests.patch b/libs/libcap/patches/300-disable-tests.patch index 9eb116ec0f..c1779e28ec 100644 --- a/libs/libcap/patches/300-disable-tests.patch +++ b/libs/libcap/patches/300-disable-tests.patch @@ -1,8 +1,8 @@ --- a/Makefile +++ b/Makefile -@@ -16,7 +16,6 @@ endif - ifeq ($(GOLANG),yes) +@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) $(MAKE) -C go $@ + rm -f cap/go.sum endif - $(MAKE) -C tests $@ $(MAKE) -C progs $@ diff --git a/libs/libcgroup/patches/010-cdefs.patch b/libs/libcgroup/patches/010-cdefs.patch index c40cbb57cf..27abb26f96 100644 --- a/libs/libcgroup/patches/010-cdefs.patch +++ b/libs/libcgroup/patches/010-cdefs.patch @@ -70,7 +70,7 @@ /** * Flags for cgroup_delete_cgroup_ext(). -@@ -577,6 +578,8 @@ char *cgroup_get_cgroup_name(struct cgroup *cgroup); +@@ -577,6 +578,8 @@ char *cgroup_get_cgroup_name(struct cgro */ @@ -97,7 +97,7 @@ /** * @defgroup group_init 1. Initialization * @{ -@@ -58,6 +56,8 @@ int cgroup_get_subsys_mount_point(const char *controller, char **mount_point); +@@ -58,6 +56,8 @@ int cgroup_get_subsys_mount_point(const * @} * @} */ @@ -123,7 +123,7 @@ /** * @defgroup group_iterators 3. Iterators -@@ -423,6 +424,8 @@ int cgroup_get_subsys_mount_point_end(void **handle); +@@ -423,6 +424,8 @@ int cgroup_get_subsys_mount_point_end(vo * @} */ @@ -152,7 +152,7 @@ /** * @defgroup group_log 7. Logging -@@ -142,6 +140,8 @@ extern int cgroup_parse_log_level_str(const char *levelstr); +@@ -142,6 +140,8 @@ extern int cgroup_parse_log_level_str(co * @} * @} */ @@ -179,7 +179,7 @@ /** Flags for cgroup_change_cgroup_uid_gid(). */ enum cgflags { -@@ -204,6 +205,8 @@ int cgroup_register_unchanged_process(pid_t pid, int flags); +@@ -204,6 +205,8 @@ int cgroup_register_unchanged_process(pi * @} * @} */ @@ -228,7 +228,7 @@ #include "config.h" #include -@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_end(void **handle); +@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_e */ int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask); diff --git a/libs/libdaemon/patches/001-daemon_set_verbosity.patch b/libs/libdaemon/patches/001-daemon_set_verbosity.patch index d0c66c7a26..bbe8f97112 100644 --- a/libs/libdaemon/patches/001-daemon_set_verbosity.patch +++ b/libs/libdaemon/patches/001-daemon_set_verbosity.patch @@ -12,11 +12,9 @@ Signed-off-by: Michael Heimpold libdaemon/dlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libdaemon/dlog.c b/libdaemon/dlog.c -index 1cc0566..cc2b918 100644 --- a/libdaemon/dlog.c +++ b/libdaemon/dlog.c -@@ -42,7 +42,7 @@ static int daemon_verbosity_level = LOG_INFO; +@@ -37,7 +37,7 @@ static int daemon_verbosity_level = LOG_ void daemon_set_verbosity(int verbosity_prio) { /* Allow using negative verbosity levels to hide _all_ messages */ @@ -25,6 +23,3 @@ index 1cc0566..cc2b918 100644 daemon_log(LOG_ERR, "The value %d is not a valid priority value", verbosity_prio); daemon_verbosity_level = verbosity_prio & LOG_PRIMASK; --- -1.7.10.4 - diff --git a/libs/libdaq/patches/001-compile.patch b/libs/libdaq/patches/001-compile.patch index d5a2882ddf..fce2b02300 100644 --- a/libs/libdaq/patches/001-compile.patch +++ b/libs/libdaq/patches/001-compile.patch @@ -1,7 +1,6 @@ -diff -u --recursive daq-2.2.2-vanilla/configure daq-2.2.2/configure ---- daq-2.2.2-vanilla/configure 2017-07-05 15:58:03.000000000 -0400 -+++ daq-2.2.2/configure 2018-09-01 17:18:56.774898034 -0400 -@@ -13244,10 +13244,11 @@ +--- a/configure ++++ b/configure +@@ -13244,10 +13244,11 @@ if ${daq_cv_libpcap_version_1x+:} false; else if test "$cross_compiling" = yes; then : diff --git a/libs/libdaq/patches/100-musl-compat.patch b/libs/libdaq/patches/100-musl-compat.patch index 6a1aa8f96b..c510564c45 100644 --- a/libs/libdaq/patches/100-musl-compat.patch +++ b/libs/libdaq/patches/100-musl-compat.patch @@ -1,6 +1,5 @@ -diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c daq-2.2.2/os-daq-modules/daq_ipfw.c ---- daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c 2017-02-08 17:04:18.000000000 -0500 -+++ daq-2.2.2/os-daq-modules/daq_ipfw.c 2018-09-01 17:21:10.608181841 -0400 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c @@ -23,10 +23,10 @@ #include #include @@ -13,9 +12,8 @@ diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c daq-2.2.2/os-daq #include #include -diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c daq-2.2.2/os-daq-modules/daq_ipq.c ---- daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c 2017-02-08 17:04:18.000000000 -0500 -+++ daq-2.2.2/os-daq-modules/daq_ipq.c 2018-09-01 17:21:23.162208457 -0400 +--- a/os-daq-modules/daq_ipq.c ++++ b/os-daq-modules/daq_ipq.c @@ -24,10 +24,10 @@ #include #include @@ -28,9 +26,8 @@ diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c daq-2.2.2/os-daq- #include -diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c daq-2.2.2/os-daq-modules/daq_nfq.c ---- daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c 2017-02-08 17:04:18.000000000 -0500 -+++ daq-2.2.2/os-daq-modules/daq_nfq.c 2018-09-01 17:21:35.202233988 -0400 +--- a/os-daq-modules/daq_nfq.c ++++ b/os-daq-modules/daq_nfq.c @@ -24,10 +24,10 @@ #include #include diff --git a/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch b/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch index a106c20c04..ac662b224c 100644 --- a/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch +++ b/libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch @@ -1,8 +1,6 @@ -Index: libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/db2/dbd_db2.c 2013-01-09 22:30:19.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c 2017-12-02 00:28:50.354329791 +0100 -@@ -57,8 +57,7 @@ +--- a/drivers/db2/dbd_db2.c ++++ b/drivers/db2/dbd_db2.c +@@ -57,8 +57,7 @@ static const dbi_info_t driver_info = { "IBM DB2 database support (using DB2 Call Level Interface)", "João Henrique F. Freitas ", "http://libdbi-drivers.sourceforge.net", @@ -12,11 +10,9 @@ Index: libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c }; static const char *custom_functions[] = {NULL}; // TODO -Index: libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/firebird/dbd_firebird.c 2013-01-09 22:20:07.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c 2017-12-02 00:28:47.418270022 +0100 -@@ -67,8 +67,7 @@ +--- a/drivers/firebird/dbd_firebird.c ++++ b/drivers/firebird/dbd_firebird.c +@@ -67,8 +67,7 @@ static const dbi_info_t driver_info = { "Firebird/Interbase database support", "Christian M. Stamgren ", "http://libdbi-drivers.sourceforge.net", @@ -26,11 +22,9 @@ Index: libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c }; -Index: libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/freetds/dbd_freetds.c 2013-01-09 22:21:11.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c 2017-12-02 00:29:05.482637950 +0100 -@@ -63,8 +63,7 @@ +--- a/drivers/freetds/dbd_freetds.c ++++ b/drivers/freetds/dbd_freetds.c +@@ -63,8 +63,7 @@ static const dbi_info_t driver_info = { "MS SQL and Sybase databases support (using libct)", "Vadym Kononenko ", "http://libdbi.sourceforge.net", @@ -40,11 +34,9 @@ Index: libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c }; static const char APP_NAME[] = "libdbi-freetds-driver"; -Index: libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/ingres/dbd_ingres.c 2013-01-09 22:30:19.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c 2017-12-02 00:29:02.370574535 +0100 -@@ -44,8 +44,7 @@ +--- a/drivers/ingres/dbd_ingres.c ++++ b/drivers/ingres/dbd_ingres.c +@@ -44,8 +44,7 @@ static const dbi_info_t driver_info = { "Ingres database support", "Toby Thain ", "http://libdbi-drivers.sourceforge.net", @@ -54,11 +46,9 @@ Index: libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c }; static const char *custom_functions[] = {NULL}; -Index: libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/msql/dbd_msql.c 2013-01-09 22:26:20.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c 2017-12-02 00:29:09.034710349 +0100 -@@ -57,8 +57,7 @@ +--- a/drivers/msql/dbd_msql.c ++++ b/drivers/msql/dbd_msql.c +@@ -57,8 +57,7 @@ static const dbi_info_t driver_info = { "Mini SQL (mSQL) database support", "Christian M. Stamgren ", "libdbi-drivers.sourceforge.net", @@ -68,11 +58,9 @@ Index: libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c }; static const char *custom_functions[] = {NULL}; -Index: libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/mysql/dbd_mysql.c 2013-02-28 00:16:20.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c 2017-12-02 00:28:42.438168678 +0100 -@@ -59,8 +59,7 @@ +--- a/drivers/mysql/dbd_mysql.c ++++ b/drivers/mysql/dbd_mysql.c +@@ -59,8 +59,7 @@ static const dbi_info_t driver_info = { "MySQL database support (using libmysqlclient)", "Mark M. Tobenkin ", "http://libdbi-drivers.sourceforge.net", @@ -82,11 +70,9 @@ Index: libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c }; static const char *custom_functions[] = MYSQL_CUSTOM_FUNCTIONS; -Index: libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/oracle/dbd_oracle.c 2013-01-09 22:27:16.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c 2017-12-02 00:28:55.958443910 +0100 -@@ -54,8 +54,7 @@ +--- a/drivers/oracle/dbd_oracle.c ++++ b/drivers/oracle/dbd_oracle.c +@@ -54,8 +54,7 @@ static const dbi_info_t driver_info = { "Oracle database support (using Oracle Call Interface)", "Ashish Ranjan ", "http://libdbi-drivers.sourceforge.net", @@ -96,11 +82,9 @@ Index: libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c }; static const char *custom_functions[] = {NULL}; -Index: libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/pgsql/dbd_pgsql.c 2017-12-02 00:28:08.737484155 +0100 -+++ libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c 2017-12-02 00:28:53.386391528 +0100 -@@ -61,8 +61,7 @@ +--- a/drivers/pgsql/dbd_pgsql.c ++++ b/drivers/pgsql/dbd_pgsql.c +@@ -61,8 +61,7 @@ static const dbi_info_t driver_info = { "PostgreSQL database support (using libpq)", "David A. Parker ", "http://libdbi-drivers.sourceforge.net", @@ -110,11 +94,9 @@ Index: libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c }; static const char *custom_functions[] = PGSQL_CUSTOM_FUNCTIONS; -Index: libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/sqlite/dbd_sqlite.c 2013-01-09 22:30:20.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c 2017-12-02 00:28:59.370513412 +0100 -@@ -65,8 +65,7 @@ +--- a/drivers/sqlite/dbd_sqlite.c ++++ b/drivers/sqlite/dbd_sqlite.c +@@ -65,8 +65,7 @@ static const dbi_info_t driver_info = { "SQLite database support (using libsqlite)", "Markus Hoenicka ", "http://libdbi-drivers.sourceforge.net", @@ -124,11 +106,9 @@ Index: libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c }; static const char *custom_functions[] = SQLITE_CUSTOM_FUNCTIONS; -Index: libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c -=================================================================== ---- libdbi-drivers-0.9.0.orig/drivers/sqlite3/dbd_sqlite3.c 2013-01-23 00:29:13.000000000 +0100 -+++ libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c 2017-12-02 00:29:11.706764820 +0100 -@@ -65,8 +65,7 @@ +--- a/drivers/sqlite3/dbd_sqlite3.c ++++ b/drivers/sqlite3/dbd_sqlite3.c +@@ -65,8 +65,7 @@ static const dbi_info_t driver_info = { "SQLite3 database support (using libsqlite3)", "Markus Hoenicka ", "http://libdbi-drivers.sourceforge.net", diff --git a/libs/libdmapsharing/patches/001-disable_pixbuf.patch b/libs/libdmapsharing/patches/001-disable_pixbuf.patch index 1409d8e980..47d4a0c316 100644 --- a/libs/libdmapsharing/patches/001-disable_pixbuf.patch +++ b/libs/libdmapsharing/patches/001-disable_pixbuf.patch @@ -1,7 +1,6 @@ -diff -u --recursive libdmapsharing-3.9.10-vanilla/configure.ac libdmapsharing-3.9.10/configure.ac ---- libdmapsharing-3.9.10-vanilla/configure.ac 2020-07-08 08:04:40.000000000 -0400 -+++ libdmapsharing-3.9.10/configure.ac 2020-07-08 21:34:56.960942899 -0400 -@@ -125,15 +125,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -125,15 +125,7 @@ fi AC_SUBST(GOBJECT_CFLAGS) AC_SUBST(GOBJECT_LIBS) diff --git a/libs/libesmtp/patches/100-openssl-1.1.patch b/libs/libesmtp/patches/100-openssl-1.1.patch index cf02c15e9b..fcbbcc2707 100644 --- a/libs/libesmtp/patches/100-openssl-1.1.patch +++ b/libs/libesmtp/patches/100-openssl-1.1.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index d586ca2..ee39284 100755 --- a/configure +++ b/configure @@ -11896,9 +11896,9 @@ fi @@ -15,7 +13,7 @@ index d586ca2..ee39284 100755 $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif @@ -50,8 +48,6 @@ index d586ca2..ee39284 100755 with_openssl=yes LIBS="-lssl -lcrypto $LIBS" -diff --git a/smtp-tls.c b/smtp-tls.c -index 9a66806..5bdc191 100644 --- a/smtp-tls.c +++ b/smtp-tls.c @@ -64,10 +64,12 @@ openssl_mutexcb (int mode, int n, diff --git a/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch b/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch index c1e50e7b1d..32f87e0f45 100644 --- a/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch +++ b/libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch @@ -7,7 +7,7 @@ Last-Update: 2015-11-07 --- a/smtp-tls.c +++ b/smtp-tls.c -@@ -197,11 +197,24 @@ starttls_create_ctx (smtp_session_t sess +@@ -202,11 +202,24 @@ starttls_create_ctx (smtp_session_t sess ckf_t status; /* The decision not to support SSL v2 and v3 but instead to use only diff --git a/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch b/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch index c890936d42..031911c45a 100644 --- a/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch +++ b/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch @@ -12,8 +12,6 @@ Signed-off-by: Rosen Penev tools/mouse-dpi-tool.c | 5 +++++ 2 files changed, 10 insertions(+) -diff --git a/tools/libevdev-events.c b/tools/libevdev-events.c -index 547513e..e5940c9 100644 --- a/tools/libevdev-events.c +++ b/tools/libevdev-events.c @@ -33,6 +33,11 @@ @@ -28,8 +26,6 @@ index 547513e..e5940c9 100644 static void print_abs_bits(struct libevdev *dev, int axis) { -diff --git a/tools/mouse-dpi-tool.c b/tools/mouse-dpi-tool.c -index 9961f3a..c4830e7 100644 --- a/tools/mouse-dpi-tool.c +++ b/tools/mouse-dpi-tool.c @@ -37,6 +37,11 @@ @@ -44,6 +40,3 @@ index 9961f3a..c4830e7 100644 #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) --- -2.25.3 - diff --git a/libs/libevhtp/patches/010-openssl-thread.patch b/libs/libevhtp/patches/010-openssl-thread.patch index 4dea38c7f0..2ad7f94b4d 100644 --- a/libs/libevhtp/patches/010-openssl-thread.patch +++ b/libs/libevhtp/patches/010-openssl-thread.patch @@ -1,6 +1,6 @@ --- a/evhtp.c +++ b/evhtp.c -@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener * serv, int fd, struct sockaddr * s, int s +@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener * } /* htp__accept_cb_ */ #ifndef EVHTP_DISABLE_SSL @@ -18,7 +18,7 @@ evhtp_ssl_use_threads(); #endif -@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, evhtp_post_accept_cb cb, void * arg) +@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, } #ifndef EVHTP_DISABLE_SSL diff --git a/libs/libexif/patches/100-no_doc.patch b/libs/libexif/patches/100-no_doc.patch index e0089c9cee..dc0d662e3e 100644 --- a/libs/libexif/patches/100-no_doc.patch +++ b/libs/libexif/patches/100-no_doc.patch @@ -1,7 +1,6 @@ -diff -u --recursive libexif-0.6.22-vanilla/Makefile.in libexif-0.6.22/Makefile.in ---- libexif-0.6.22-vanilla/Makefile.in 2020-05-18 14:51:57.000000000 -0500 -+++ libexif-0.6.22/Makefile.in 2020-11-10 14:02:49.736268440 -0600 -@@ -393,7 +393,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -393,7 +393,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/libs/libffi/patches/100-fix_mips_softfloat.patch b/libs/libffi/patches/100-fix_mips_softfloat.patch index c3f70242ab..66f4711e16 100644 --- a/libs/libffi/patches/100-fix_mips_softfloat.patch +++ b/libs/libffi/patches/100-fix_mips_softfloat.patch @@ -8,8 +8,6 @@ Thank you! src/mips/o32.S | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/mips/o32.S b/src/mips/o32.S -index 44e74cb9..799139b2 100644 --- a/src/mips/o32.S +++ b/src/mips/o32.S @@ -282,9 +282,11 @@ $LCFI12: diff --git a/libs/libffi/patches/200-ppc.patch b/libs/libffi/patches/200-ppc.patch index c8ae4a94d0..fb36ba3f61 100644 --- a/libs/libffi/patches/200-ppc.patch +++ b/libs/libffi/patches/200-ppc.patch @@ -21,8 +21,6 @@ Signed-off-by: Sergei Trofimovich src/powerpc/ffi_powerpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h -index 5ee2a709..8e2f2f0e 100644 --- a/src/powerpc/ffi_powerpc.h +++ b/src/powerpc/ffi_powerpc.h @@ -62,7 +62,7 @@ typedef _Float128 float128; diff --git a/libs/libftdi1/patches/100-fix-x86_64-build.patch b/libs/libftdi1/patches/100-fix-x86_64-build.patch index 495db1789a..12861d967e 100644 --- a/libs/libftdi1/patches/100-fix-x86_64-build.patch +++ b/libs/libftdi1/patches/100-fix-x86_64-build.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,7 @@ if ( NOT DEFINED LIB_SUFFIX ) +@@ -57,7 +57,7 @@ if ( NOT DEFINED LIB_SUFFIX ) AND NOT EXISTS "/etc/debian_version" AND NOT EXISTS "/etc/arch-release" ) if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" ) diff --git a/libs/libgabe/patches/010-shared-library.patch b/libs/libgabe/patches/010-shared-library.patch index 4524756279..5bdc73e7bd 100644 --- a/libs/libgabe/patches/010-shared-library.patch +++ b/libs/libgabe/patches/010-shared-library.patch @@ -7,8 +7,6 @@ Subject: [PATCH] shared library Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index f23bf90..c8c19fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,13 +18,12 @@ LDFLAGS = @LDFLAGS@ \ @@ -28,7 +26,7 @@ index f23bf90..c8c19fa 100644 # test: test.o libgabe.a # $(CC) -o $@ $(LDFLAGS) $^ -@@ -44,14 +43,14 @@ dist: AUTHORS COPYING INSTALL NEWS README \ +@@ -44,14 +43,14 @@ dist: AUTHORS COPYING INSTALL NEWS READM tar zc $(DISTNAME) > $(DISTNAME).tar.gz rm -rf $(DISTNAME) @@ -46,6 +44,3 @@ index f23bf90..c8c19fa 100644 /bin/rm -f $(DESTDIR)$(includedir)/gabe.h # development and meta stuff --- -2.17.1 - diff --git a/libs/libgd/patches/010-getlib.patch b/libs/libgd/patches/010-getlib.patch index 00027e5a9c..cf4de3383b 100644 --- a/libs/libgd/patches/010-getlib.patch +++ b/libs/libgd/patches/010-getlib.patch @@ -8,9 +8,6 @@ Subject: [PATCH] distribute getlib.sh 1 file changed, 42 insertions(+) create mode 100755 config/getlib.sh -diff --git a/config/getlib.sh b/config/getlib.sh -new file mode 100755 -index 0000000..4835cf6 --- /dev/null +++ b/config/getlib.sh @@ -0,0 +1,42 @@ @@ -56,6 +53,3 @@ index 0000000..4835cf6 + printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))" + ;; +esac --- -2.25.1 - diff --git a/libs/libhttp-parser/patches/000-fix_darwin_error.patch b/libs/libhttp-parser/patches/000-fix_darwin_error.patch index 98290e065b..55684a6aef 100644 --- a/libs/libhttp-parser/patches/000-fix_darwin_error.patch +++ b/libs/libhttp-parser/patches/000-fix_darwin_error.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -25,11 +25,7 @@ +@@ -25,11 +25,7 @@ SOLIBNAME = libhttp_parser SOMAJOR = 2 SOMINOR = 9 SOREV = 4 @@ -13,7 +13,7 @@ CC = winegcc BINEXT = .exe.so HELPER = wine -@@ -65,12 +61,8 @@ +@@ -65,12 +61,8 @@ PREFIX ?= /usr/local LIBDIR = $(PREFIX)/lib INCLUDEDIR = $(PREFIX)/include @@ -26,7 +26,7 @@ test: test_g test_fast $(HELPER) ./test_g$(BINEXT) -@@ -131,14 +123,18 @@ +@@ -131,14 +123,18 @@ tags: http_parser.c http_parser.h test.c ctags $^ install: library diff --git a/libs/libimobiledevice/patches/120-iOS14.patch b/libs/libimobiledevice/patches/120-iOS14.patch index 9b981c88e2..db9dd36fc5 100644 --- a/libs/libimobiledevice/patches/120-iOS14.patch +++ b/libs/libimobiledevice/patches/120-iOS14.patch @@ -22,7 +22,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+ typedef enum { --- a/include/libimobiledevice/lockdown.h +++ b/include/libimobiledevice/lockdown.h -@@ -96,6 +96,7 @@ typedef struct lockdownd_pair_record *lockdownd_pair_record_t; +@@ -96,6 +96,7 @@ typedef struct lockdownd_pair_record *lo struct lockdownd_service_descriptor { uint16_t port; uint8_t ssl_enabled; @@ -32,7 +32,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+ --- a/src/debugserver.c +++ b/src/debugserver.c -@@ -80,7 +80,10 @@ LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_new(idevice_t device +@@ -80,7 +80,10 @@ LIBIMOBILEDEVICE_API debugserver_error_t debug_info("Creating base service client failed. Error: %i", ret); return ret; } @@ -44,7 +44,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+ debugserver_client_t client_loc = (debugserver_client_t) malloc(sizeof(struct debugserver_client_private)); client_loc->parent = parent; -@@ -95,7 +98,11 @@ LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_new(idevice_t device +@@ -95,7 +98,11 @@ LIBIMOBILEDEVICE_API debugserver_error_t LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_start_service(idevice_t device, debugserver_client_t * client, const char* label) { debugserver_error_t err = DEBUGSERVER_E_UNKNOWN_ERROR; @@ -59,7 +59,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+ --- a/src/lockdown.c +++ b/src/lockdown.c -@@ -1307,6 +1307,7 @@ static lockdownd_error_t lockdownd_do_start_service(lockdownd_client_t client, c +@@ -1307,6 +1307,7 @@ static lockdownd_error_t lockdownd_do_st *service = (lockdownd_service_descriptor_t)malloc(sizeof(struct lockdownd_service_descriptor)); (*service)->port = 0; (*service)->ssl_enabled = 0; @@ -67,7 +67,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+ /* read service port number */ plist_t node = plist_dict_get_item(dict, "Port"); -@@ -1511,8 +1512,10 @@ LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_data_classes_free(char **classe +@@ -1511,8 +1512,10 @@ LIBIMOBILEDEVICE_API lockdownd_error_t l LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_service_descriptor_free(lockdownd_service_descriptor_t service) { diff --git a/libs/liblo/patches/010-index.patch b/libs/liblo/patches/010-index.patch index f3f86609f2..160ed3a56b 100644 --- a/libs/liblo/patches/010-index.patch +++ b/libs/liblo/patches/010-index.patch @@ -1,6 +1,6 @@ --- a/src/server.c +++ b/src/server.c -@@ -2013,11 +2013,8 @@ static void dispatch_method(lo_server s, const char *path, +@@ -2013,11 +2013,8 @@ static void dispatch_method(lo_server s, tmp = (char*) malloc(strlen(it->path + len) + 1); strcpy(tmp, it->path + len); diff --git a/libs/liblo/patches/020-usleep.patch b/libs/liblo/patches/020-usleep.patch index b0bf17f744..2b138f602d 100644 --- a/libs/liblo/patches/020-usleep.patch +++ b/libs/liblo/patches/020-usleep.patch @@ -1,6 +1,6 @@ --- a/src/tools/oscsendfile.c +++ b/src/tools/oscsendfile.c -@@ -354,7 +354,7 @@ int send_file(lo_address target, double speed) { +@@ -354,7 +354,7 @@ int send_file(lo_address target, double lo_timetag_now(&tt_now); double wait_time = timetag_diff(*tt_last, tt_now); if (wait_time > 0.) { @@ -9,7 +9,7 @@ } if (b) { ret = lo_send_bundle(target, b); -@@ -376,7 +376,7 @@ int send_file(lo_address target, double speed) { +@@ -376,7 +376,7 @@ int send_file(lo_address target, double lo_timetag_now(&tt_now); double wait_time = timetag_diff(*tt_last, tt_now); if (wait_time > 0.) { diff --git a/libs/libmad/patches/001-mips_removal_h_constraint.patch b/libs/libmad/patches/001-mips_removal_h_constraint.patch index b65555e1fa..6b129c1cfe 100644 --- a/libs/libmad/patches/001-mips_removal_h_constraint.patch +++ b/libs/libmad/patches/001-mips_removal_h_constraint.patch @@ -1,7 +1,6 @@ -diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h ---- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030 -+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930 -@@ -299,6 +299,23 @@ +--- a/fixed.h ++++ b/fixed.h +@@ -299,6 +299,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t # elif defined(FPM_MIPS) @@ -25,7 +24,7 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h /* * This MIPS version is fast and accurate; the disposition of the least * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -328,6 +345,7 @@ +@@ -328,6 +345,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t : "%r" ((x) >> 12), "r" ((y) >> 16)) # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) # endif @@ -33,10 +32,9 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h # if defined(OPT_SPEED) # define mad_f_scale64(hi, lo) \ -diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h ---- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030 -+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930 -@@ -344,6 +344,23 @@ +--- a/mad.h ++++ b/mad.h +@@ -344,6 +344,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t # elif defined(FPM_MIPS) @@ -60,7 +58,7 @@ diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h /* * This MIPS version is fast and accurate; the disposition of the least * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -373,6 +390,7 @@ +@@ -373,6 +390,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t : "%r" ((x) >> 12), "r" ((y) >> 16)) # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) # endif diff --git a/libs/libmad/patches/101-CVE-2017-8374-length-check.patch b/libs/libmad/patches/101-CVE-2017-8374-length-check.patch index 80e48469e6..872a43ed4e 100644 --- a/libs/libmad/patches/101-CVE-2017-8374-length-check.patch +++ b/libs/libmad/patches/101-CVE-2017-8374-length-check.patch @@ -6,10 +6,8 @@ There are various cases where it attemps to read past the end of the buffer using mad_bit_read(). Most functions didn't even know the size of the buffer they were reading from. -Index: libmad-0.15.1b/bit.c -=================================================================== ---- libmad-0.15.1b.orig/bit.c -+++ libmad-0.15.1b/bit.c +--- a/bit.c ++++ b/bit.c @@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi { register unsigned long value; @@ -20,10 +18,8 @@ Index: libmad-0.15.1b/bit.c if (bitptr->left == CHAR_BIT) bitptr->cache = *bitptr->byte; -Index: libmad-0.15.1b/frame.c -=================================================================== ---- libmad-0.15.1b.orig/frame.c -+++ libmad-0.15.1b/frame.c +--- a/frame.c ++++ b/frame.c @@ -120,11 +120,18 @@ static int decode_header(struct mad_header *header, struct mad_stream *stream) { @@ -85,10 +81,8 @@ Index: libmad-0.15.1b/frame.c ptr = stream->next_frame = stream->this_frame + 1; goto sync; } -Index: libmad-0.15.1b/layer12.c -=================================================================== ---- libmad-0.15.1b.orig/layer12.c -+++ libmad-0.15.1b/layer12.c +--- a/layer12.c ++++ b/layer12.c @@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = { * DESCRIPTION: decode one requantized Layer I sample from a bitstream */ @@ -343,10 +337,8 @@ Index: libmad-0.15.1b/layer12.c for (ch = 0; ch < nch; ++ch) { for (s = 0; s < 3; ++s) { -Index: libmad-0.15.1b/layer3.c -=================================================================== ---- libmad-0.15.1b.orig/layer3.c -+++ libmad-0.15.1b/layer3.c +--- a/layer3.c ++++ b/layer3.c @@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b static unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr, @@ -806,7 +798,7 @@ Index: libmad-0.15.1b/layer3.c } mad_bit_finish(&peek); -@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *str +@@ -2645,7 +2725,7 @@ int mad_layer_III(struct mad_stream *str /* decode main_data */ if (result == 0) { diff --git a/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch b/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch index 657b5ffdb9..bedc86552d 100644 --- a/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch +++ b/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch @@ -26,11 +26,9 @@ stream->md_len bytes. If stream->md_len is larger than the data we need from the previous frame (si.main_data_begin) it still wouldn't fit in the buffer, so just keep the data that we need. -Index: libmad-0.15.1b/layer3.c -=================================================================== ---- libmad-0.15.1b.orig/layer3.c -+++ libmad-0.15.1b/layer3.c -@@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *str +--- a/layer3.c ++++ b/layer3.c +@@ -2688,6 +2688,11 @@ int mad_layer_III(struct mad_stream *str next_md_begin = 0; md_len = si.main_data_begin + frame_space - next_md_begin; @@ -42,7 +40,7 @@ Index: libmad-0.15.1b/layer3.c frame_used = 0; -@@ -2625,8 +2630,11 @@ int mad_layer_III(struct mad_stream *str +@@ -2705,8 +2710,11 @@ int mad_layer_III(struct mad_stream *str } } else { diff --git a/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch b/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch index 1ce28ffe55..823335dbd5 100644 --- a/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch +++ b/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch @@ -8,11 +8,9 @@ In case resulting value should be negative it is incorrect to use '+' operator t src/modbus.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/src/modbus.h b/src/modbus.h -index f6e9a5f..c63f5ce 100644 --- a/src/modbus.h +++ b/src/modbus.h -@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, +@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(mo #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF) #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF) #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \ @@ -30,6 +28,3 @@ index f6e9a5f..c63f5ce 100644 #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \ do { \ tab_int8[(index)] = (value) >> 8; \ --- -2.17.1 - diff --git a/libs/libmpeg2/patches/102-arm_data_preload_check.patch b/libs/libmpeg2/patches/102-arm_data_preload_check.patch index 86793fcd75..7351b62688 100644 --- a/libs/libmpeg2/patches/102-arm_data_preload_check.patch +++ b/libs/libmpeg2/patches/102-arm_data_preload_check.patch @@ -1,6 +1,5 @@ -diff -urN libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S ---- libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200 -+++ libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S 2012-07-30 15:22:58.664964215 +0200 +--- a/libmpeg2/motion_comp_arm_s.S ++++ b/libmpeg2/motion_comp_arm_s.S @@ -19,6 +19,15 @@ @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/libs/libmraa/patches/020-support_v12.patch b/libs/libmraa/patches/020-support_v12.patch index cc70d5ba64..0ac0013c35 100644 --- a/libs/libmraa/patches/020-support_v12.patch +++ b/libs/libmraa/patches/020-support_v12.patch @@ -1,6 +1,6 @@ --- a/api/mraa/gpio.hpp +++ b/api/mraa/gpio.hpp -@@ -175,7 +175,11 @@ +@@ -175,7 +175,11 @@ class Gpio v8::Local argv[] = { SWIGV8_INTEGER_NEW(-1) }; #if NODE_MODULE_VERSION >= 0x000D v8::Local f = v8::Local::New(v8::Isolate::GetCurrent(), This->m_v8isr); diff --git a/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch b/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch index c9b325b4da..02938c1a76 100644 --- a/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch +++ b/libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch @@ -11,8 +11,6 @@ Signed-off-by: Jan Engelhardt Make_global.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Make_global.am b/Make_global.am -index b7dab7b..a4e9bd9 100644 --- a/Make_global.am +++ b/Make_global.am @@ -1,2 +1,2 @@ @@ -20,6 +18,3 @@ index b7dab7b..a4e9bd9 100644 -AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS} +AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS} +AM_CFLAGS = -Wall --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch b/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch index ce47198ff6..5be6999a45 100644 --- a/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch +++ b/libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch @@ -8,8 +8,6 @@ Signed-off-by: Jan Engelhardt Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index b758e56..9a1cbcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,4 @@ @@ -19,6 +17,3 @@ index b758e56..9a1cbcb 100644 ACLOCAL_AMFLAGS = -I m4 --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch b/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch index 77cb1b4921..c62619827c 100644 --- a/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch +++ b/libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch @@ -12,8 +12,6 @@ Signed-off-by: Jan Engelhardt configure.ac | 1 + 1 file changed, 1 insertion(+) -diff --git a/configure.ac b/configure.ac -index fe6e75f..e6e1317 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) @@ -24,6 +22,3 @@ index fe6e75f..e6e1317 100644 dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch b/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch index 78578750bf..1e612561a2 100644 --- a/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch +++ b/libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch @@ -7,8 +7,6 @@ Subject: [PATCH 4/6] Add include needed for integer type definition. include/libnetfilter_log/libnetfilter_log.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h -index 6b0d3b0..a1331de 100644 --- a/include/libnetfilter_log/libnetfilter_log.h +++ b/include/libnetfilter_log/libnetfilter_log.h @@ -9,6 +9,7 @@ @@ -19,6 +17,3 @@ index 6b0d3b0..a1331de 100644 #include struct nflog_handle; --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch b/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch index ff78bb3ea1..b1daa0a7cc 100644 --- a/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch +++ b/libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch @@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index e6e1317..189a753 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PROG_INSTALL @@ -22,6 +20,3 @@ index e6e1317..189a753 100644 *) AC_MSG_ERROR([Linux only, dude!]);; esac --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch b/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch index 839f81bbbd..d8f5667d47 100644 --- a/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch +++ b/libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch @@ -16,8 +16,6 @@ Signed-off-by: Pablo Neira Ayuso utils/Makefile.am | 7 +++++-- 4 files changed, 19 insertions(+), 4 deletions(-) -diff --git a/configure.ac b/configure.ac -index 189a753..88ff7ab 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,11 @@ case "$host" in @@ -32,8 +30,6 @@ index 189a753..88ff7ab 100644 dnl Dependencies PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41]) -diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am -index fe934f1..fde1d60 100644 --- a/include/libnetfilter_log/Makefile.am +++ b/include/libnetfilter_log/Makefile.am @@ -1,3 +1,6 @@ @@ -44,8 +40,6 @@ index fe934f1..fde1d60 100644 +if BUILD_IPULOG +pkginclude_HEADERS += libipulog.h +endif -diff --git a/src/Makefile.am b/src/Makefile.am -index 10a66e2..33933a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,14 +22,18 @@ LIBVERSION=2:0:1 @@ -68,8 +62,6 @@ index 10a66e2..33933a4 100644 libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c +endif -diff --git a/utils/Makefile.am b/utils/Makefile.am -index ae64c90..f961b6c 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,12 +1,15 @@ @@ -90,6 +82,3 @@ index ae64c90..f961b6c 100644 ulog_test_LDFLAGS = -dynamic - +endif --- -1.7.10.4 - diff --git a/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch b/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch index f7f733402a..07efe83097 100644 --- a/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch +++ b/libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch @@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++------------- 1 file changed, 25 insertions(+), 26 deletions(-) -diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h -index 4c802c8..9f38277 100644 --- a/include/libnetfilter_log/linux_nfnetlink_log.h +++ b/include/libnetfilter_log/linux_nfnetlink_log.h @@ -20,33 +20,31 @@ enum nfulnl_msg_types { @@ -103,6 +101,3 @@ index 4c802c8..9f38277 100644 #define NFULNL_CFG_F_SEQ 0x0001 #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002 --- -2.11.0 - diff --git a/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch b/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch index 60973a276a..778e773fac 100644 --- a/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch +++ b/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch @@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h -index 9f38277..081e7f9 100644 --- a/include/libnetfilter_log/linux_nfnetlink_log.h +++ b/include/libnetfilter_log/linux_nfnetlink_log.h @@ -1,16 +1,12 @@ @@ -47,6 +45,3 @@ index 9f38277..081e7f9 100644 +#define NFULNL_CFG_F_CONNTRACK 0x0004 #endif /* _NFNETLINK_LOG_H */ --- -2.11.0 - diff --git a/libs/libnetfilter-queue/patches/0002-src-fix-IPv6-header-handling.patch b/libs/libnetfilter-queue/patches/0002-src-fix-IPv6-header-handling.patch index db5aaa0168..83713f33e3 100644 --- a/libs/libnetfilter-queue/patches/0002-src-fix-IPv6-header-handling.patch +++ b/libs/libnetfilter-queue/patches/0002-src-fix-IPv6-header-handling.patch @@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/src/extra/ipv6.c +++ b/src/extra/ipv6.c -@@ -67,10 +67,19 @@ int nfq_ip6_set_transport_header(struct +@@ -67,10 +67,19 @@ int nfq_ip6_set_transport_header(struct uint8_t nexthdr = ip6h->ip6_nxt; uint8_t *cur = (uint8_t *)ip6h + sizeof(struct ip6_hdr); @@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso /* No more extensions, we're done. */ if (nexthdr == IPPROTO_NONE) { cur = NULL; -@@ -107,11 +116,13 @@ int nfq_ip6_set_transport_header(struct +@@ -107,11 +116,13 @@ int nfq_ip6_set_transport_header(struct } else if (nexthdr == IPPROTO_AH) hdrlen = (ip6_ext->ip6e_len + 2) << 2; else diff --git a/libs/libnopoll/patches/010-openssl-deprecated.patch b/libs/libnopoll/patches/010-openssl-deprecated.patch index fb82df4899..c4c640db71 100644 --- a/libs/libnopoll/patches/010-openssl-deprecated.patch +++ b/libs/libnopoll/patches/010-openssl-deprecated.patch @@ -1,5 +1,3 @@ -diff --git a/src/nopoll.c b/src/nopoll.c -index d4b50f3..3603f41 100644 --- a/src/nopoll.c +++ b/src/nopoll.c @@ -868,9 +868,11 @@ void nopoll_cleanup_library (void) @@ -14,11 +12,9 @@ index d4b50f3..3603f41 100644 /* notify the library isn't initialized */ __nopoll_tls_was_init = nopoll_false; -diff --git a/src/nopoll_conn.c b/src/nopoll_conn.c -index 0b85382..1770723 100644 --- a/src/nopoll_conn.c +++ b/src/nopoll_conn.c -@@ -1380,7 +1380,9 @@ noPollConn * nopoll_conn_tls_new (noPollCtx * ctx, +@@ -1380,7 +1380,9 @@ noPollConn * nopoll_conn_tls_new (noPoll /* init ssl ciphers and engines */ if (! __nopoll_tls_was_init) { __nopoll_tls_was_init = nopoll_true; @@ -28,7 +24,7 @@ index 0b85382..1770723 100644 } /* end if */ /* call common implementation */ -@@ -1426,7 +1428,9 @@ noPollConn * nopoll_conn_tls_new6 (noPollCtx * ctx, +@@ -1426,7 +1428,9 @@ noPollConn * nopoll_conn_tls_new6 (noPol /* init ssl ciphers and engines */ if (! __nopoll_tls_was_init) { __nopoll_tls_was_init = nopoll_true; @@ -38,7 +34,7 @@ index 0b85382..1770723 100644 } /* end if */ /* call common implementation */ -@@ -1495,7 +1499,9 @@ noPollConn * nopoll_conn_tls_new_with_socket (noPollCtx * ctx, +@@ -1495,7 +1499,9 @@ noPollConn * nopoll_conn_tls_new_with_so /* init ssl ciphers and engines */ if (! __nopoll_tls_was_init) { __nopoll_tls_was_init = nopoll_true; @@ -48,7 +44,7 @@ index 0b85382..1770723 100644 } /* end if */ /* call common implementation */ -@@ -4755,7 +4761,9 @@ nopoll_bool __nopoll_conn_accept_complete_common (noPollCtx * ctx, noPollConnOpt +@@ -4755,7 +4761,9 @@ nopoll_bool __nopoll_conn_accept_complet /* init ssl ciphers and engines */ if (! __nopoll_tls_was_init) { __nopoll_tls_was_init = nopoll_true; @@ -58,8 +54,6 @@ index 0b85382..1770723 100644 } /* end if */ /* now configure chainCertificate */ -diff --git a/src/nopoll_decl.h b/src/nopoll_decl.h -index bfe496e..b0ce535 100644 --- a/src/nopoll_decl.h +++ b/src/nopoll_decl.h @@ -511,20 +511,18 @@ typedef enum { diff --git a/libs/libowfat/patches/001-fixbuild.patch b/libs/libowfat/patches/001-fixbuild.patch index 05e3f20567..804b6e490f 100644 --- a/libs/libowfat/patches/001-fixbuild.patch +++ b/libs/libowfat/patches/001-fixbuild.patch @@ -1,6 +1,6 @@ --- a/GNUmakefile +++ b/GNUmakefile -@@ -357,6 +357,8 @@ socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \ +@@ -357,6 +357,8 @@ socket_accept4.o socket_accept6.o socket socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \ socket_remote6.o: havesl.h diff --git a/libs/libp11/patches/001-fix-install.patch b/libs/libp11/patches/001-fix-install.patch index 0a576c688b..06c1a4c3db 100644 --- a/libs/libp11/patches/001-fix-install.patch +++ b/libs/libp11/patches/001-fix-install.patch @@ -16,7 +16,7 @@ mylibdir=$(libdir) --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -899,7 +899,7 @@ distdir-am: $(DISTFILES) +@@ -900,7 +900,7 @@ distdir-am: $(DISTFILES) fi; \ done check-am: all-am @@ -25,7 +25,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h installdirs: -@@ -988,7 +988,7 @@ install-dvi-am: +@@ -989,7 +989,7 @@ install-dvi-am: install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES @$(NORMAL_INSTALL) @@ -34,7 +34,7 @@ install-html: install-html-am install-html-am: -@@ -1051,14 +1051,14 @@ uninstall-am: uninstall-enginesexecLTLIB +@@ -1052,14 +1052,14 @@ uninstall-am: uninstall-enginesexecLTLIB .MAKE: all check-am install-am install-exec-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \ diff --git a/libs/libpfring/patches/0002-kernel-pf_ring.c-linux-v5.9-compatibility.patch b/libs/libpfring/patches/0002-kernel-pf_ring.c-linux-v5.9-compatibility.patch index 6d6b0475ff..52bbaa690c 100644 --- a/libs/libpfring/patches/0002-kernel-pf_ring.c-linux-v5.9-compatibility.patch +++ b/libs/libpfring/patches/0002-kernel-pf_ring.c-linux-v5.9-compatibility.patch @@ -22,7 +22,7 @@ unsigned int optlen) { -@@ -6842,7 +6852,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6842,7 +6852,7 @@ static int ring_setsockopt(struct socket ret = -EFAULT; @@ -31,7 +31,7 @@ break; if(fprog.len <= 1) { /* empty filter */ -@@ -6888,7 +6898,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6888,7 +6898,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(cluster)) return(-EINVAL); @@ -40,7 +40,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -6911,7 +6921,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6911,7 +6921,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(channel_id_mask)) return(-EINVAL); @@ -49,7 +49,7 @@ return(-EFAULT); num_channels = 0; -@@ -6967,7 +6977,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6967,7 +6977,7 @@ static int ring_setsockopt(struct socket if(optlen > sizeof(name) /* Names should not be too long */ ) return(-EINVAL); @@ -58,7 +58,7 @@ return(-EFAULT); if(pfr->appl_name != NULL) -@@ -6985,7 +6995,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6985,7 +6995,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(direction)) return(-EINVAL); @@ -67,7 +67,7 @@ return(-EFAULT); pfr->direction = direction; -@@ -6999,7 +7009,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -6999,7 +7009,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(sockmode)) return(-EINVAL); @@ -76,7 +76,7 @@ return(-EFAULT); pfr->mode = sockmode; -@@ -7013,7 +7023,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7013,7 +7023,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(rule_inactivity)) return(-EINVAL); @@ -85,7 +85,7 @@ return(-EFAULT); else { write_lock_bh(&pfr->ring_rules_lock); -@@ -7027,7 +7037,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7027,7 +7037,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(rule_inactivity)) return(-EINVAL); @@ -94,7 +94,7 @@ return(-EFAULT); else { write_lock_bh(&pfr->ring_rules_lock); -@@ -7043,7 +7053,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7043,7 +7053,7 @@ static int ring_setsockopt(struct socket else { u_int8_t new_policy; @@ -103,7 +103,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -7075,7 +7085,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7075,7 +7085,7 @@ static int ring_setsockopt(struct socket if(rule == NULL) return(-EFAULT); @@ -112,7 +112,7 @@ return(-EFAULT); INIT_LIST_HEAD(&rule->list); -@@ -7099,7 +7109,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7099,7 +7109,7 @@ static int ring_setsockopt(struct socket if(rule == NULL) return(-EFAULT); @@ -121,7 +121,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -7123,7 +7133,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7123,7 +7133,7 @@ static int ring_setsockopt(struct socket /* This is a list rule */ int rc; @@ -130,7 +130,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -7139,7 +7149,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7139,7 +7149,7 @@ static int ring_setsockopt(struct socket sw_filtering_hash_bucket rule; int rc; @@ -139,7 +139,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -7156,7 +7166,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7156,7 +7166,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(pfr->sample_rate)) return(-EINVAL); @@ -148,7 +148,7 @@ return(-EFAULT); break; -@@ -7164,7 +7174,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7164,7 +7174,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(pfr->filtering_sample_rate)) return(-EINVAL); @@ -157,7 +157,7 @@ return(-EFAULT); pfr->filtering_sampling_size = pfr->filtering_sample_rate; -@@ -7231,7 +7241,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7231,7 +7241,7 @@ static int ring_setsockopt(struct socket else threshold = min_num_slots; @@ -166,7 +166,7 @@ return(-EFAULT); if(pfr->poll_num_pkts_watermark > threshold) -@@ -7248,7 +7258,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7248,7 +7258,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(u_int16_t)) return(-EINVAL); else { @@ -175,7 +175,7 @@ return(-EFAULT); debug_printk(2, "--> SO_SET_POLL_WATERMARK_TIMEOUT=%u\n", pfr->poll_watermark_timeout); } -@@ -7258,7 +7268,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7258,7 +7268,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(u_int32_t)) return(-EINVAL); @@ -184,7 +184,7 @@ return(-EFAULT); debug_printk(2, "--> SO_RING_BUCKET_LEN=%d\n", pfr->bucket_len); -@@ -7268,7 +7278,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7268,7 +7278,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(zc_dev_mapping)) return(-EINVAL); @@ -193,7 +193,7 @@ return(-EFAULT); debug_printk(2, "SO_SELECT_ZC_DEVICE %s\n", mapping.device_name); -@@ -7278,7 +7288,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7278,7 +7288,7 @@ static int ring_setsockopt(struct socket else ret = pfring_release_zc_dev(pfr); @@ -202,7 +202,7 @@ return(-EFAULT); break; -@@ -7291,7 +7301,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7291,7 +7301,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(ring_id)) return(-EINVAL); @@ -211,7 +211,7 @@ return(-EFAULT); write_lock_bh(&pfr->ring_rules_lock); -@@ -7303,7 +7313,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7303,7 +7313,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(hw_filtering_rule)) return(-EINVAL); @@ -220,7 +220,7 @@ return(-EFAULT); /* Check if a rule with the same id exists */ -@@ -7343,7 +7353,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7343,7 +7353,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(u_int16_t)) return(-EINVAL); @@ -229,7 +229,7 @@ return(-EFAULT); /* Check if the rule we want to remove exists */ -@@ -7381,7 +7391,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7381,7 +7391,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(elem)) return(-EINVAL); @@ -238,7 +238,7 @@ return(-EFAULT); if((pfr->v_filtering_dev = add_virtual_filtering_device(pfr, &elem)) == NULL) -@@ -7402,14 +7412,14 @@ static int ring_setsockopt(struct socket *sock, +@@ -7402,14 +7412,14 @@ static int ring_setsockopt(struct socket if(optlen < sizeof(ccri)) return(-EINVAL); @@ -255,7 +255,7 @@ remove_cluster_referee(pfr); return(-EFAULT); } -@@ -7422,7 +7432,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7422,7 +7432,7 @@ static int ring_setsockopt(struct socket { struct public_cluster_object_info pcoi; @@ -264,7 +264,7 @@ return(-EFAULT); if(publish_cluster_object(pfr, pcoi.cluster_id, pcoi.object_type, pcoi.object_id) < 0) -@@ -7436,7 +7446,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7436,7 +7446,7 @@ static int ring_setsockopt(struct socket { struct lock_cluster_object_info lcoi; @@ -273,7 +273,7 @@ return(-EFAULT); if(lock_cluster_object(pfr, lcoi.cluster_id, lcoi.object_type, lcoi.object_id, lcoi.lock_mask) < 0) -@@ -7450,7 +7460,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7450,7 +7460,7 @@ static int ring_setsockopt(struct socket { struct lock_cluster_object_info lcoi; @@ -282,7 +282,7 @@ return(-EFAULT); if(unlock_cluster_object(pfr, lcoi.cluster_id, lcoi.object_type, lcoi.object_id, lcoi.lock_mask) < 0) -@@ -7465,7 +7475,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7465,7 +7475,7 @@ static int ring_setsockopt(struct socket if(optlen > (sizeof(pfr->custom_bound_device_name)-1)) optlen = sizeof(pfr->custom_bound_device_name)-1; @@ -291,7 +291,7 @@ pfr->custom_bound_device_name[0] = '\0'; return(-EFAULT); } else -@@ -7490,7 +7500,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7490,7 +7500,7 @@ static int ring_setsockopt(struct socket if(optlen > (sizeof(pfr->statsString)-1)) optlen = sizeof(pfr->statsString)-1; @@ -300,7 +300,7 @@ pfr->statsString[0] = '\0'; return(-EFAULT); } -@@ -7511,7 +7521,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7511,7 +7521,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(u_int32_t)) return (-EINVAL); @@ -309,7 +309,7 @@ return (-EFAULT); if(!pfr->ring_dev || pfr->ring_dev == &none_device_element || pfr->ring_dev == &any_device_element) { -@@ -7537,7 +7547,7 @@ static int ring_setsockopt(struct socket *sock, +@@ -7537,7 +7547,7 @@ static int ring_setsockopt(struct socket if(optlen != sizeof(vlan_id)) return(-EINVAL); diff --git a/libs/libre2/patches/010-cxx17.patch b/libs/libre2/patches/010-cxx17.patch index 1eccb319d2..ddc3acbcaa 100644 --- a/libs/libre2/patches/010-cxx17.patch +++ b/libs/libre2/patches/010-cxx17.patch @@ -14,7 +14,7 @@ if(WIN32) --- a/re2.pc +++ b/re2.pc -@@ -6,5 +6,5 @@ libdir=@libdir@ +@@ -4,5 +4,5 @@ libdir=@libdir@ Name: re2 Description: RE2 is a fast, safe, thread-friendly regular expression engine. Version: 0.0.0 diff --git a/libs/libtheora/patches/001-no_docs_tests.patch b/libs/libtheora/patches/001-no_docs_tests.patch index 4a45b8b5bb..d035b93bff 100644 --- a/libs/libtheora/patches/001-no_docs_tests.patch +++ b/libs/libtheora/patches/001-no_docs_tests.patch @@ -1,7 +1,6 @@ -diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am ---- libtheora-1.1.1/Makefile.am 2009-07-14 01:55:02.000000000 +0200 -+++ libtheora-1.1.1.new/Makefile.am 2012-12-05 14:21:06.103521554 +0100 -@@ -8,7 +8,7 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,7 @@ else EXAMPLES_DIR = endif @@ -10,10 +9,9 @@ diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am # we include the whole debian/ dir in EXTRA_DIST because there's a problem -diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in ---- libtheora-1.1.1/Makefile.in 2009-10-01 20:04:07.000000000 +0200 -+++ libtheora-1.1.1.new/Makefile.in 2012-12-05 14:21:18.239521864 +0100 -@@ -164,7 +164,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = @@ -22,7 +20,7 @@ diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in # we include the whole debian/ dir in EXTRA_DIST because there's a problem # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am -@@ -200,7 +200,7 @@ +@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ theoradec-uninstalled.pc.in theoradec.pc.in \ theoraenc-uninstalled.pc.in theoraenc.pc.in diff --git a/libs/libtheora/patches/002-no_sdl_check.patch b/libs/libtheora/patches/002-no_sdl_check.patch index a1e7256b4b..f27e4dd436 100644 --- a/libs/libtheora/patches/002-no_sdl_check.patch +++ b/libs/libtheora/patches/002-no_sdl_check.patch @@ -1,6 +1,6 @@ ---- libtheora-1.1.1/configure.ac 2009-10-01 20:00:33.000000000 +0200 -+++ libtheora-1.1.1.new/configure.ac 2012-12-05 14:22:26.319523608 +0100 -@@ -313,11 +313,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -313,11 +313,6 @@ fi dnl check for SDL HAVE_SDL=no diff --git a/libs/libtorrent/patches/010-usleep.patch b/libs/libtorrent/patches/010-usleep.patch index 6539fad1f5..e3522f67ee 100644 --- a/libs/libtorrent/patches/010-usleep.patch +++ b/libs/libtorrent/patches/010-usleep.patch @@ -12,7 +12,7 @@ #include "torrent/exceptions.h" #include "torrent/data/download_data.h" -@@ -137,7 +138,7 @@ HashQueue::remove(HashQueueNode::id_type id) { +@@ -137,7 +138,7 @@ HashQueue::remove(HashQueueNode::id_type while ((done_itr = m_done_chunks.find(hash_chunk)) == m_done_chunks.end()) { pthread_mutex_unlock(&m_done_chunks_lock); @@ -43,7 +43,7 @@ } acquire_global_lock(); -@@ -161,7 +162,7 @@ thread_base::event_loop(thread_base* thread) { +@@ -161,7 +162,7 @@ thread_base::event_loop(thread_base* thr } // Add the sleep call when testing interrupts, etc. diff --git a/libs/libupm/patches/001-version.patch b/libs/libupm/patches/001-version.patch index 49147e6e29..b1f9c9f1bf 100644 --- a/libs/libupm/patches/001-version.patch +++ b/libs/libupm/patches/001-version.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -231,14 +231,7 @@ +@@ -231,14 +231,7 @@ include(GNUInstallDirs) set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") # Make a version file containing the current version from git. @@ -9,10 +9,10 @@ -# If git_describe fails, use a dirty version -if (${VERSION} MATCHES -NOTFOUND) - set (VERSION "v1.7.1") -+ set (VERSION "v2.0.0") - message (WARNING "Failed to retrieve UPM version with 'git describe' (using " - "${VERSION}). Check that git is installed and this is a valid git repo.") -endif () ++ set (VERSION "v2.0.0") message (STATUS "UPM Version ${VERSION}") diff --git a/libs/libupm/patches/002-at42qt1070-id.patch b/libs/libupm/patches/002-at42qt1070-id.patch index 94758ef163..295bfd560d 100644 --- a/libs/libupm/patches/002-at42qt1070-id.patch +++ b/libs/libupm/patches/002-at42qt1070-id.patch @@ -1,6 +1,6 @@ --- a/src/at42qt1070/at42qt1070.cxx +++ b/src/at42qt1070/at42qt1070.cxx -@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t address) +@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t return; } diff --git a/libs/libupm/patches/004-uint8_t.patch b/libs/libupm/patches/004-uint8_t.patch index 4f975b06a7..46d25edd74 100644 --- a/libs/libupm/patches/004-uint8_t.patch +++ b/libs/libupm/patches/004-uint8_t.patch @@ -1,7 +1,6 @@ -diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx ---- a/src/bma250e/bma250e.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bma250e/bma250e.cxx 2019-05-13 16:43:04.344536227 +0900 -@@ -195,35 +195,35 @@ +--- a/src/bma250e/bma250e.cxx ++++ b/src/bma250e/bma250e.cxx +@@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) : fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { @@ -45,10 +44,9 @@ diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { -diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx ---- a/src/bmg160/bmg160.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bmg160/bmg160.cxx 2019-05-13 16:44:25.516304666 +0900 -@@ -173,23 +173,23 @@ +--- a/src/bmg160/bmg160.cxx ++++ b/src/bmg160/bmg160.cxx +@@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mr fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { @@ -77,10 +75,9 @@ diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { -diff -urN a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx ---- a/src/bmm150/bmm150.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bmm150/bmm150.cxx 2019-05-13 16:45:03.228197100 +0900 -@@ -170,19 +170,19 @@ +--- a/src/bmm150/bmm150.cxx ++++ b/src/bmm150/bmm150.cxx +@@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mr setOpmode(opmode); } if(tok.substr(0, 19) == "setInterruptEnable:") { diff --git a/libs/libuwsc/patches/001-fix_find_lua.patch b/libs/libuwsc/patches/001-fix_find_lua.patch index d40eec4a95..00d5c3ec46 100644 --- a/libs/libuwsc/patches/001-fix_find_lua.patch +++ b/libs/libuwsc/patches/001-fix_find_lua.patch @@ -1,7 +1,5 @@ -Index: libuwsc-3.3.1/cmake/Modules/FindLua.cmake -=================================================================== --- /dev/null -+++ libuwsc-3.3.1/cmake/Modules/FindLua.cmake ++++ b/cmake/Modules/FindLua.cmake @@ -0,0 +1,18 @@ +# - Try to find lua +# Once done this will define diff --git a/libs/libv4l/patches/010-remove-libudev-check.patch b/libs/libv4l/patches/010-remove-libudev-check.patch index 2e55aa2883..56e51fa773 100644 --- a/libs/libv4l/patches/010-remove-libudev-check.patch +++ b/libs/libv4l/patches/010-remove-libudev-check.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -309,16 +309,9 @@ else +@@ -291,16 +291,9 @@ else AC_MSG_WARN(ALSA library not available) fi diff --git a/libs/libwslay/patches/100-disable-doc.patch b/libs/libwslay/patches/100-disable-doc.patch index d5a21bad26..56e08aef6a 100644 --- a/libs/libwslay/patches/100-disable-doc.patch +++ b/libs/libwslay/patches/100-disable-doc.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index ae8b02f..2e86973 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,6 @@ @@ -8,10 +6,8 @@ index ae8b02f..2e86973 100644 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SUBDIRS = lib tests examples doc +SUBDIRS = lib tests - + ACLOCAL_AMFLAGS = -I m4 -diff --git a/configure.ac b/configure.ac -index 5e83cbf..88f4f03 100644 --- a/configure.ac +++ b/configure.ac @@ -123,9 +123,6 @@ AC_CONFIG_FILES([ @@ -23,4 +19,4 @@ index 5e83cbf..88f4f03 100644 - doc/sphinx/conf.py ]) AC_OUTPUT - + diff --git a/libs/libx264/patches/001-fix-x32-build-by-disabling-asm.patch b/libs/libx264/patches/001-fix-x32-build-by-disabling-asm.patch index a41d4e7861..d6e68feb86 100644 --- a/libs/libx264/patches/001-fix-x32-build-by-disabling-asm.patch +++ b/libs/libx264/patches/001-fix-x32-build-by-disabling-asm.patch @@ -18,7 +18,7 @@ Signed-off-by: Christopher Larson --- a/configure +++ b/configure -@@ -736,7 +736,13 @@ case $host_cpu in +@@ -769,7 +769,13 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" stack_alignment=16 @@ -33,7 +33,7 @@ Signed-off-by: Christopher Larson if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" if cc_check '' "-arch x86_64"; then -@@ -755,7 +761,11 @@ case $host_cpu in +@@ -788,7 +794,11 @@ case $host_cpu in RCFLAGS="--target=pe-x86-64 $RCFLAGS" fi else diff --git a/libs/libx264/patches/002-dont-default-to-cortex-a9-with-neon.patch b/libs/libx264/patches/002-dont-default-to-cortex-a9-with-neon.patch index 7062b67610..42f2042c8e 100644 --- a/libs/libx264/patches/002-dont-default-to-cortex-a9-with-neon.patch +++ b/libs/libx264/patches/002-dont-default-to-cortex-a9-with-neon.patch @@ -16,7 +16,7 @@ Signed-off-by: Maxin B. John --- a/configure +++ b/configure -@@ -940,9 +940,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $A +@@ -975,9 +975,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $A fi if [ $asm = auto -a $ARCH = ARM ] ; then diff --git a/libs/libxml2/patches/001-CVE-2019-20388.patch b/libs/libxml2/patches/001-CVE-2019-20388.patch index 653b5701dc..80d4ca45f0 100644 --- a/libs/libxml2/patches/001-CVE-2019-20388.patch +++ b/libs/libxml2/patches/001-CVE-2019-20388.patch @@ -16,11 +16,9 @@ Signed-off-by: Zhipeng Xie xmlschemas.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c84499..39d92182f 100644 --- a/xmlschemas.c +++ b/xmlschemas.c -@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { +@@ -28095,7 +28095,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vc vctxt->nberrors = 0; vctxt->depth = -1; vctxt->skipDepth = -1; @@ -28,6 +26,3 @@ index 301c84499..39d92182f 100644 vctxt->hasKeyrefs = 0; #ifdef ENABLE_IDC_NODE_TABLES_TEST vctxt->createIDCNodeTables = 1; --- -GitLab - diff --git a/libs/libxml2/patches/002-CVE-2020-24977.patch b/libs/libxml2/patches/002-CVE-2020-24977.patch index fe4b39800b..dbba4f0595 100644 --- a/libs/libxml2/patches/002-CVE-2020-24977.patch +++ b/libs/libxml2/patches/002-CVE-2020-24977.patch @@ -14,8 +14,6 @@ Fixes #178. xmllint.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/xmllint.c b/xmllint.c -index f6a8e4636..c647486f3 100644 --- a/xmllint.c +++ b/xmllint.c @@ -528,6 +528,12 @@ static void @@ -31,6 +29,3 @@ index f6a8e4636..c647486f3 100644 result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); if (result) { xmlGenericError(xmlGenericErrorContext, "%s", result); --- -GitLab - diff --git a/libs/libxml2/patches/003-CVE-2020-7595.patch b/libs/libxml2/patches/003-CVE-2020-7595.patch index 4f12bff9fb..b80f0b3841 100644 --- a/libs/libxml2/patches/003-CVE-2020-7595.patch +++ b/libs/libxml2/patches/003-CVE-2020-7595.patch @@ -13,11 +13,9 @@ Signed-off-by: Zhipeng Xie parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/parser.c b/parser.c -index d1c319631..a34bb6cdd 100644 --- a/parser.c +++ b/parser.c -@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, +@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxt else c = 0; while ((c != 0) && (c != end) && /* non input consuming loop */ @@ -27,6 +25,3 @@ index d1c319631..a34bb6cdd 100644 if (c == 0) break; if ((c == '&') && (str[1] == '#')) { --- -GitLab - diff --git a/libs/libyaml-cpp/patches/010-libcxx.patch b/libs/libyaml-cpp/patches/010-libcxx.patch index c908b1d847..26128be84a 100644 --- a/libs/libyaml-cpp/patches/010-libcxx.patch +++ b/libs/libyaml-cpp/patches/010-libcxx.patch @@ -8,8 +8,6 @@ Somehow this instantiates a template properly otherwise the build fails include/yaml-cpp/node/iterator.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/include/yaml-cpp/node/iterator.h b/include/yaml-cpp/node/iterator.h -index b4472381..080ec76c 100644 --- a/include/yaml-cpp/node/iterator.h +++ b/include/yaml-cpp/node/iterator.h @@ -15,6 +15,8 @@ diff --git a/libs/lmdb/patches/010-fix-makefile.patch b/libs/lmdb/patches/010-fix-makefile.patch index 23a30fa80a..f038e0dd35 100644 --- a/libs/lmdb/patches/010-fix-makefile.patch +++ b/libs/lmdb/patches/010-fix-makefile.patch @@ -5,19 +5,19 @@ datarootdir = $(prefix)/share mandir = $(datarootdir)/man +FPIC ?= -fPIC - + ######################################################################## - + @@ -86,10 +87,10 @@ midl.o: midl.c midl.h $(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c - + mdb.lo: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@ + $(CC) $(CFLAGS) $(FPIC) $(CPPFLAGS) -c mdb.c -o $@ - + midl.lo: midl.c midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@ + $(CC) $(CFLAGS) $(FPIC) $(CPPFLAGS) -c midl.c -o $@ - + %: %.o $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ diff --git a/libs/loudmouth/patches/001-allow-disable-libidn.patch b/libs/loudmouth/patches/001-allow-disable-libidn.patch index 88aac5bdca..6519ec7e3b 100644 --- a/libs/loudmouth/patches/001-allow-disable-libidn.patch +++ b/libs/loudmouth/patches/001-allow-disable-libidn.patch @@ -1,5 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index 8435d9a..148453c 100644 --- a/configure.ac +++ b/configure.ac @@ -109,9 +109,22 @@ else diff --git a/libs/loudmouth/patches/002-fix-comparison.patch b/libs/loudmouth/patches/002-fix-comparison.patch index 7373516cb7..104a07854e 100644 --- a/libs/loudmouth/patches/002-fix-comparison.patch +++ b/libs/loudmouth/patches/002-fix-comparison.patch @@ -1,7 +1,6 @@ -diff -u --recursive loudmouth-1.5.3-vanilla/loudmouth/lm-sasl.c loudmouth-1.5.3/loudmouth/lm-sasl.c ---- loudmouth-1.5.3-vanilla/loudmouth/lm-sasl.c 2018-07-27 22:42:03.250616281 -0400 -+++ loudmouth-1.5.3/loudmouth/lm-sasl.c 2018-07-27 22:42:26.756659723 -0400 -@@ -529,7 +529,7 @@ +--- a/loudmouth/lm-sasl.c ++++ b/loudmouth/lm-sasl.c +@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl, } nonce = g_hash_table_lookup (challenge, "nonce"); diff --git a/libs/loudmouth/patches/010-add-private.patch b/libs/loudmouth/patches/010-add-private.patch index 7d1b3763d7..670cdaac63 100644 --- a/libs/loudmouth/patches/010-add-private.patch +++ b/libs/loudmouth/patches/010-add-private.patch @@ -13,8 +13,6 @@ g_type_class_add_private() will be deprecated in GLib 2.58. Replace: loudmouth/lm-resolver.c | 28 +++++++++++++--------------- 3 files changed, 30 insertions(+), 37 deletions(-) -diff --git a/loudmouth/lm-blocking-resolver.c b/loudmouth/lm-blocking-resolver.c -index 5a25061..d980d24 100644 --- a/loudmouth/lm-blocking-resolver.c +++ b/loudmouth/lm-blocking-resolver.c @@ -38,10 +38,10 @@ @@ -31,7 +29,7 @@ index 5a25061..d980d24 100644 GSource *idle_source; }; -@@ -49,7 +49,7 @@ static void blocking_resolver_dispose (GObject *object); +@@ -49,7 +49,7 @@ static void blocking_resolver_finali static void blocking_resolver_lookup (LmResolver *resolver); static void blocking_resolver_cancel (LmResolver *resolver); @@ -40,7 +38,7 @@ index 5a25061..d980d24 100644 static void lm_blocking_resolver_class_init (LmBlockingResolverClass *class) -@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlockingResolverClass *class) +@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlock resolver_class->lookup = blocking_resolver_lookup; resolver_class->cancel = blocking_resolver_cancel; @@ -50,7 +48,7 @@ index 5a25061..d980d24 100644 } static void -@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBlockingResolver *resolver) +@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBloc static gboolean blocking_resolver_idle_lookup (LmBlockingResolver *resolver) { @@ -59,7 +57,7 @@ index 5a25061..d980d24 100644 gint type; /* Start the DNS querying */ -@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockingResolver *resolver) +@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockin static void blocking_resolver_lookup (LmResolver *resolver) { @@ -68,7 +66,7 @@ index 5a25061..d980d24 100644 GMainContext *context; g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver)); -@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *resolver) +@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *re static void blocking_resolver_cancel (LmResolver *resolver) { @@ -77,8 +75,6 @@ index 5a25061..d980d24 100644 g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver)); -diff --git a/loudmouth/lm-feature-ping.c b/loudmouth/lm-feature-ping.c -index b2dd439..bfd1e6d 100644 --- a/loudmouth/lm-feature-ping.c +++ b/loudmouth/lm-feature-ping.c @@ -28,10 +28,10 @@ @@ -95,7 +91,7 @@ index b2dd439..bfd1e6d 100644 LmConnection *connection; guint keep_alive_rate; GSource *keep_alive_source; -@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler, +@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply gpointer user_data); static gboolean feature_ping_send_keep_alive (LmFeaturePing *fp); @@ -104,7 +100,7 @@ index b2dd439..bfd1e6d 100644 enum { PROP_0, -@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePingClass *class) +@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePin NULL, NULL, _lm_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -113,7 +109,7 @@ index b2dd439..bfd1e6d 100644 } static void -@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *object, +@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *o GValue *value, GParamSpec *pspec) { @@ -122,7 +118,7 @@ index b2dd439..bfd1e6d 100644 priv = GET_PRIV (object); -@@ -147,7 +145,7 @@ feature_ping_set_property (GObject *object, +@@ -147,7 +145,7 @@ feature_ping_set_property (GObject const GValue *value, GParamSpec *pspec) { @@ -131,7 +127,7 @@ index b2dd439..bfd1e6d 100644 priv = GET_PRIV (object); -@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler, +@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessage LmMessage *m, gpointer user_data) { @@ -140,7 +136,7 @@ index b2dd439..bfd1e6d 100644 priv = GET_PRIV (user_data); -@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler, +@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessage static gboolean feature_ping_send_keep_alive (LmFeaturePing *fp) { @@ -149,7 +145,7 @@ index b2dd439..bfd1e6d 100644 LmMessage *ping; LmMessageNode *ping_node; LmMessageHandler *keep_alive_handler; -@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeaturePing *fp) +@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeatureP void lm_feature_ping_start (LmFeaturePing *fp) { @@ -158,7 +154,7 @@ index b2dd439..bfd1e6d 100644 g_return_if_fail (LM_IS_FEATURE_PING (fp)); -@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp) +@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp void lm_feature_ping_stop (LmFeaturePing *fp) { @@ -167,8 +163,6 @@ index b2dd439..bfd1e6d 100644 g_return_if_fail (LM_IS_FEATURE_PING (fp)); -diff --git a/loudmouth/lm-resolver.c b/loudmouth/lm-resolver.c -index b9d7762..a0500ef 100644 --- a/loudmouth/lm-resolver.c +++ b/loudmouth/lm-resolver.c @@ -36,10 +36,10 @@ @@ -185,7 +179,7 @@ index b9d7762..a0500ef 100644 GMainContext *context; LmResolverCallback callback; -@@ -71,7 +71,7 @@ static void resolver_set_property (GObject *object, +@@ -71,7 +71,7 @@ static void resolver_set_property const GValue *value, GParamSpec *pspec); @@ -194,7 +188,7 @@ index b9d7762..a0500ef 100644 enum { PROP_0, -@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass *class) +@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass "Protocol for SRV lookup", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); @@ -212,7 +206,7 @@ index b9d7762..a0500ef 100644 priv = GET_PRIV (object); -@@ -190,7 +188,7 @@ resolver_get_property (GObject *object, +@@ -190,7 +188,7 @@ resolver_get_property (GObject *objec GValue *value, GParamSpec *pspec) { @@ -221,7 +215,7 @@ index b9d7762..a0500ef 100644 priv = GET_PRIV (object); -@@ -228,7 +226,7 @@ resolver_set_property (GObject *object, +@@ -228,7 +226,7 @@ resolver_set_property (GObject *obj const GValue *value, GParamSpec *pspec) { @@ -230,7 +224,7 @@ index b9d7762..a0500ef 100644 priv = GET_PRIV (object); -@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar *host, +@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar gpointer user_data) { LmResolver *resolver; @@ -239,7 +233,7 @@ index b9d7762..a0500ef 100644 g_return_val_if_fail (host != NULL, NULL); g_return_val_if_fail (callback != NULL, NULL); -@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar *domain, +@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar gpointer user_data) { LmResolver *resolver; @@ -248,7 +242,7 @@ index b9d7762..a0500ef 100644 g_return_val_if_fail (domain != NULL, NULL); g_return_val_if_fail (service != NULL, NULL); -@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver) +@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver struct addrinfo * lm_resolver_results_get_next (LmResolver *resolver) { @@ -266,7 +260,7 @@ index b9d7762..a0500ef 100644 g_return_if_fail (LM_IS_RESOLVER (resolver)); -@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver *resolver, +@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver LmResolverResult result, struct addrinfo *results) { diff --git a/libs/loudmouth/patches/900-disable-docs-examples-tests.patch b/libs/loudmouth/patches/900-disable-docs-examples-tests.patch index e2c91e6b55..d664e8457a 100644 --- a/libs/loudmouth/patches/900-disable-docs-examples-tests.patch +++ b/libs/loudmouth/patches/900-disable-docs-examples-tests.patch @@ -12,7 +12,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -307,12 +307,7 @@ AC_SUBST(LOUDMOUTH_LIBS) +@@ -320,12 +320,7 @@ AC_SUBST(LOUDMOUTH_LIBS) AC_OUTPUT([ Makefile diff --git a/libs/minizip/patches/010-disable-libbsd.patch b/libs/minizip/patches/010-disable-libbsd.patch index caa481843c..85858c698e 100644 --- a/libs/minizip/patches/010-disable-libbsd.patch +++ b/libs/minizip/patches/010-disable-libbsd.patch @@ -12,11 +12,9 @@ https://github.com/openwrt/packages/issues/12471 CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0de10cf..217359a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17,6 +17,7 @@ option(MZ_PKCRYPT "Enables PKWARE traditional encryption" ON) +@@ -17,6 +17,7 @@ option(MZ_PKCRYPT "Enables PKWARE tradit option(MZ_WZAES "Enables WinZIP AES encryption" ON) option(MZ_LIBCOMP "Enables Apple compression" OFF) option(MZ_OPENSSL "Enables OpenSSL for encryption" OFF) @@ -24,7 +22,7 @@ index 0de10cf..217359a 100644 option(MZ_BRG "Enables Brian Gladman's encryption library" OFF) option(MZ_SIGNING "Enables zip signing support" ON) option(MZ_COMPRESS_ONLY "Only support compression" OFF) -@@ -275,7 +276,7 @@ if(UNIX) +@@ -298,7 +299,7 @@ if(UNIX) endif() endif() @@ -33,7 +31,7 @@ index 0de10cf..217359a 100644 find_package(PkgConfig REQUIRED) pkg_check_modules(LIBBSD libbsd) -@@ -288,6 +289,8 @@ if(UNIX) +@@ -311,6 +312,8 @@ if(UNIX) list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS}) link_directories(${LIBBSD_LIBRARY_DIRS}) endif() @@ -42,7 +40,7 @@ index 0de10cf..217359a 100644 endif() endif() endif() -@@ -935,6 +938,7 @@ add_feature_info(MZ_PKCRYPT MZ_PKCRYPT "Enables PKWARE traditional encryption") +@@ -943,6 +946,7 @@ add_feature_info(MZ_PKCRYPT MZ_PKCRYPT " add_feature_info(MZ_WZAES MZ_WZAES "Enables WinZIP AES encryption") add_feature_info(MZ_LIBCOMP MZ_LIBCOMP "Enables Apple compression") add_feature_info(MZ_OPENSSL MZ_OPENSSL "Enables OpenSSL for encryption") @@ -50,6 +48,3 @@ index 0de10cf..217359a 100644 add_feature_info(MZ_BRG MZ_BRG "Enables Brian Gladman's encryption library") add_feature_info(MZ_SIGNING MZ_SIGNING "Enables zip signing support") add_feature_info(MZ_COMPRESS_ONLY MZ_COMPRESS_ONLY "Only support compression") --- -2.17.1 - diff --git a/libs/newt/patches/python_memory_allocation.patch b/libs/newt/patches/python_memory_allocation.patch index 48f203d576..4dd3b29ed9 100644 --- a/libs/newt/patches/python_memory_allocation.patch +++ b/libs/newt/patches/python_memory_allocation.patch @@ -15,7 +15,7 @@ Forwarded: no if (!widget) return NULL; -@@ -937,7 +937,7 @@ static snackForm * formCreate(PyObject * +@@ -932,7 +932,7 @@ static snackForm * formCreate(PyObject * if (help == Py_None) help = NULL; @@ -24,7 +24,7 @@ Forwarded: no form->fo = newtForm(NULL, help, 0); return form; -@@ -949,7 +949,7 @@ static snackGrid * gridCreate(PyObject * +@@ -944,7 +944,7 @@ static snackGrid * gridCreate(PyObject * if (!PyArg_ParseTuple(args, "ii", &cols, &rows)) return NULL; diff --git a/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch b/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch index 184f89cf49..4b4b6fb390 100644 --- a/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch +++ b/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch @@ -22,8 +22,6 @@ Signed-off-by: Mingli Yu pr/src/Makefile.in | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 --- a/nspr/lib/ds/Makefile.in +++ b/nspr/lib/ds/Makefile.in @@ -110,13 +110,7 @@ GARBAGE += $(TINC) @@ -41,8 +39,6 @@ index e737791..b578476 100644 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 --- a/nspr/lib/libc/src/Makefile.in +++ b/nspr/lib/libc/src/Makefile.in @@ -112,13 +112,7 @@ GARBAGE += $(TINC) @@ -60,8 +56,6 @@ index e8a6d9f..978ed28 100644 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 --- a/nspr/lib/prstreams/Makefile.in +++ b/nspr/lib/prstreams/Makefile.in @@ -110,13 +110,7 @@ endif @@ -79,11 +73,9 @@ index aeb2944..f318097 100644 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 --- a/nspr/pr/src/Makefile.in +++ b/nspr/pr/src/Makefile.in -@@ -310,13 +310,7 @@ GARBAGE += $(TINC) +@@ -306,13 +306,7 @@ GARBAGE += $(TINC) $(TINC): @$(MAKE_OBJDIR) @@ -98,6 +90,3 @@ index 19c5a69..b4ac31c 100644 $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/libs/nspr/patches/002-native_and_musl_fix.patch b/libs/nspr/patches/002-native_and_musl_fix.patch index c5485dbfeb..d2c2d73bd3 100644 --- a/libs/nspr/patches/002-native_and_musl_fix.patch +++ b/libs/nspr/patches/002-native_and_musl_fix.patch @@ -1,6 +1,6 @@ ---- a/nspr/config/config.mk 2017-10-31 13:13:22.692343122 +0200 -+++ b/nspr/config/config.mk 2017-10-31 13:13:58.758016378 +0200 -@@ -126,6 +126,9 @@ +--- a/nspr/config/config.mk ++++ b/nspr/config/config.mk +@@ -126,6 +126,9 @@ endif ifeq ($(USE_IPV6),1) DEFINES += -D_PR_INET6 @@ -10,9 +10,9 @@ endif ifeq ($(MOZ_UNICODE),1) ---- a/nspr/config/Makefile.in 2019-03-31 13:44:56.919871810 +0300 -+++ b/nspr/config/Makefile.in 2019-03-31 13:45:21.560545948 +0300 -@@ -30,7 +30,7 @@ +--- a/nspr/config/Makefile.in ++++ b/nspr/config/Makefile.in +@@ -30,7 +30,7 @@ CSRCS = now.c # This version hasn't been ported for us; the one in mozilla/config has ifneq ($(OS_ARCH),OS2) diff --git a/libs/p11-kit/patches/010-stdint.patch b/libs/p11-kit/patches/010-stdint.patch index 7cbc3d9ea4..546c062b5e 100644 --- a/libs/p11-kit/patches/010-stdint.patch +++ b/libs/p11-kit/patches/010-stdint.patch @@ -10,8 +10,6 @@ Signed-off-by: Daniel Engberg p11-kit/lists.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/p11-kit/lists.c b/p11-kit/lists.c -index 365a6d89..1d9062be 100644 --- a/p11-kit/lists.c +++ b/p11-kit/lists.c @@ -39,6 +39,7 @@ diff --git a/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch b/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch index 6ace9a36ba..bce2217ea2 100644 --- a/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch +++ b/libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch @@ -1,5 +1,5 @@ ---- a/configure.ac.orig 2016-11-22 20:44:21.205150763 +0800 -+++ b/configure.ac 2016-11-22 20:44:55.505161500 +0800 +--- a/configure.ac ++++ b/configure.ac @@ -735,7 +735,6 @@ dnl Check if assembler is gas compatible have_mips_dspr2=no AC_MSG_CHECKING(whether to use MIPS DSPr2 assembler) diff --git a/libs/pthsem/patches/001-linux3x-fix.patch b/libs/pthsem/patches/001-linux3x-fix.patch index 3b968f7276..60aff546e2 100644 --- a/libs/pthsem/patches/001-linux3x-fix.patch +++ b/libs/pthsem/patches/001-linux3x-fix.patch @@ -1,6 +1,6 @@ ---- pthsem-2.0.8/acinclude.m4 -+++ pthsem-2.0.8/acinclude.m4 -@@ -892,6 +892,8 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -892,6 +892,8 @@ case $PLATFORM in case "x`uname -r`" in changequote(, )dnl x2.[23456789]* ) ;; @@ -9,4 +9,3 @@ changequote([, ]) * ) braindead=yes ;; esac - diff --git a/libs/pthsem/patches/002-fix-signal.h b/libs/pthsem/patches/002-fix-signal.h index 0e4fdfc7fa..79791532f0 100644 --- a/libs/pthsem/patches/002-fix-signal.h +++ b/libs/pthsem/patches/002-fix-signal.h @@ -1,5 +1,5 @@ ---- a/pth.h.in 2015-07-16 21:14:48.786970549 +0200 -+++ b/pth.h.in 2015-07-16 21:15:22.439416462 +0200 +--- a/pth.h.in ++++ b/pth.h.in @@ -43,7 +43,7 @@ #include /* for struct timespec */ #include /* for struct timeval */ @@ -9,9 +9,9 @@ @EXTRA_INCLUDE_SYS_SELECT_H@ /* fallbacks for essential typedefs */ ---- a/pthread.h.in 2015-07-16 21:14:58.948310639 +0200 -+++ b/pthread.h.in 2015-07-16 21:15:40.989869061 +0200 -@@ -111,7 +111,7 @@ +--- a/pthread.h.in ++++ b/pthread.h.in +@@ -111,7 +111,7 @@ typedef int __vendor_sched_param; #include /* for ssize_t */ #include /* for struct timeval */ #include /* for sockaddr */ diff --git a/libs/pthsem/patches/003-linux4x-fix.patch b/libs/pthsem/patches/003-linux4x-fix.patch index d8e4d17352..167ba4e593 100644 --- a/libs/pthsem/patches/003-linux4x-fix.patch +++ b/libs/pthsem/patches/003-linux4x-fix.patch @@ -1,7 +1,5 @@ -Index: pthsem-2.0.8/acinclude.m4 -=================================================================== ---- pthsem-2.0.8.orig/acinclude.m4 -+++ pthsem-2.0.8/acinclude.m4 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -894,6 +894,8 @@ changequote(, )dnl x2.[23456789]* ) ;; changequote(, )dnl diff --git a/libs/quasselc/patches/001-respect-cflags-ldflags.patch b/libs/quasselc/patches/001-respect-cflags-ldflags.patch index f6ddef031e..e5c8f61b7e 100644 --- a/libs/quasselc/patches/001-respect-cflags-ldflags.patch +++ b/libs/quasselc/patches/001-respect-cflags-ldflags.patch @@ -14,7 +14,7 @@ BOTLIBS := -Wl,-rpath,. -@@ -15,10 +15,10 @@ lib_objects=setters.o getters.o main.o cmds.o negotiation.o io.o symbols.o +@@ -15,10 +15,10 @@ lib_objects=setters.o getters.o main.o c all: bot libquasselc.so.$(VERSION) quasselc.pc libquasselc.so.$(VERSION): $(lib_objects) diff --git a/libs/spice/patches/010-librt-libm.patch b/libs/spice/patches/010-librt-libm.patch index 69f64913b3..faba9632d9 100644 --- a/libs/spice/patches/010-librt-libm.patch +++ b/libs/spice/patches/010-librt-libm.patch @@ -13,11 +13,9 @@ Acked-by: Frediano Ziglio meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/meson.build b/meson.build -index 1685c077..f9090a82 100644 --- a/meson.build +++ b/meson.build -@@ -102,7 +102,7 @@ foreach dep : ['libjpeg', 'zlib'] +@@ -103,7 +103,7 @@ foreach dep : ['libjpeg', 'zlib'] endforeach if host_machine.system() != 'windows' diff --git a/libs/spice/patches/020-no-code-generation.patch b/libs/spice/patches/020-no-code-generation.patch index ec4cd62fa7..89a7eb32db 100644 --- a/libs/spice/patches/020-no-code-generation.patch +++ b/libs/spice/patches/020-no-code-generation.patch @@ -14,11 +14,9 @@ Signed-off-by: Frediano Ziglio tests/meson.build | 34 ++++++++++++++++++---------------- 4 files changed, 47 insertions(+), 41 deletions(-) -diff --git a/common/meson.build b/common/meson.build -index 7356cc0..14bf242 100644 --- a/subprojects/spice-common/common/meson.build +++ b/subprojects/spice-common/common/meson.build -@@ -67,19 +67,21 @@ spice_common_dep = declare_dependency(link_with : spice_common_lib, +@@ -67,19 +67,21 @@ spice_common_dep = declare_dependency(li # client_demarshallers @@ -28,13 +26,6 @@ index 7356cc0..14bf242 100644 - '--include', 'common/messages.h', - '--generated-declaration-file', '@OUTPUT1@', - '@INPUT@', '@OUTPUT0@'] -- --client_demarshallers = custom_target('client_demarshallers', -- input : [spice_proto], -- output : ['generated_client_demarshallers.c', 'generated_messages.h'], -- install : false, -- command : [codegen_cmd, codegen_args], -- depend_files : [spice_codegen_files, 'messages.h']) +if spice_common_generate_client_code or spice_common_generate_server_code + codegen_cmd = [python, spice_codegen] + codegen_args = ['--generate-demarshallers', @@ -42,7 +33,13 @@ index 7356cc0..14bf242 100644 + '--include', 'common/messages.h', + '--generated-declaration-file', '@OUTPUT1@', + '@INPUT@', '@OUTPUT0@'] -+ + +-client_demarshallers = custom_target('client_demarshallers', +- input : [spice_proto], +- output : ['generated_client_demarshallers.c', 'generated_messages.h'], +- install : false, +- command : [codegen_cmd, codegen_args], +- depend_files : [spice_codegen_files, 'messages.h']) + client_demarshallers = custom_target('client_demarshallers', + input : [spice_proto], + output : ['generated_client_demarshallers.c', 'generated_messages.h'], @@ -53,17 +50,18 @@ index 7356cc0..14bf242 100644 # # libspice-common-client -diff --git a/meson.build b/meson.build -index 41a9419..b60a9fe 100644 --- a/subprojects/spice-common/meson.build +++ b/subprojects/spice-common/meson.build -@@ -119,17 +119,19 @@ foreach dep, version : optional_deps +@@ -131,17 +131,19 @@ foreach dep, version : optional_deps endforeach # Python -py_module = import('python') -python = py_module.find_installation() -- ++if spice_common_generate_client_code or spice_common_generate_server_code ++ py_module = import('python') ++ python = py_module.find_installation() + -if get_option('python-checks') - foreach module : ['six', 'pyparsing'] - message('Checking for python module @0@'.format(module)) @@ -72,10 +70,6 @@ index 41a9419..b60a9fe 100644 - error('Python module @0@ not found'.format(module)) - endif - endforeach -+if spice_common_generate_client_code or spice_common_generate_server_code -+ py_module = import('python') -+ python = py_module.find_installation() -+ + if get_option('python-checks') + foreach module : ['six', 'pyparsing'] + message('Checking for python module @0@'.format(module)) @@ -88,11 +82,9 @@ index 41a9419..b60a9fe 100644 endif # smartcard check -diff --git a/meson_options.txt b/meson_options.txt -index d30858f..d93d74b 100644 --- a/subprojects/spice-common/meson_options.txt +++ b/subprojects/spice-common/meson_options.txt -@@ -39,7 +39,7 @@ option('manual', +@@ -45,7 +45,7 @@ option('manual', option('generate-code', type : 'combo', @@ -101,11 +93,9 @@ index d30858f..d93d74b 100644 description : 'Which code should be built') option('tests', -diff --git a/tests/meson.build b/tests/meson.build -index d315056..1ad5bc5 100644 --- a/subprojects/spice-common/tests/meson.build +++ b/subprojects/spice-common/tests/meson.build -@@ -20,26 +20,28 @@ endforeach +@@ -15,26 +15,28 @@ endforeach # # test_marshallers # @@ -150,6 +140,3 @@ index d315056..1ad5bc5 100644 # # test_quic --- -GitLab - diff --git a/libs/spice/patches/030-include-generated-code.patch b/libs/spice/patches/030-include-generated-code.patch index a6caf27077..4d8d5e37c5 100644 --- a/libs/spice/patches/030-include-generated-code.patch +++ b/libs/spice/patches/030-include-generated-code.patch @@ -10,14 +10,18 @@ Signed-off-by: Rosen Penev subprojects/spice-common/common/meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) -diff --git a/subprojects/spice-common/common/meson.build b/subprojects/spice-common/common/meson.build -index 7356cc0..5796989 100644 --- a/subprojects/spice-common/common/meson.build +++ b/subprojects/spice-common/common/meson.build -@@ -180,6 +180,19 @@ if spice_common_generate_server_code - endif - endforeach - +@@ -187,4 +187,17 @@ if spice_common_generate_server_code + spice_common_server_dep = declare_dependency(sources : spice_common_server_dep_sources, + link_with : spice_common_server_lib, + dependencies : spice_common_dep) ++else ++ spice_common_server_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h'] ++ spice_common_server_sources += ['generated_server_demarshallers.c'] ++ spice_common_server_dep_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h'] ++ spice_common_server_dep_sources += ['generated_server_demarshallers.c'] ++ + spice_common_server_lib = static_library('spice-common-server', spice_common_server_sources, + install : false, + dependencies : spice_common_dep) @@ -25,12 +29,4 @@ index 7356cc0..5796989 100644 + spice_common_server_dep = declare_dependency(sources : spice_common_server_dep_sources, + link_with : spice_common_server_lib, + dependencies : spice_common_dep) -+else -+ spice_common_server_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h'] -+ spice_common_server_sources += ['generated_server_demarshallers.c'] -+ spice_common_server_dep_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h'] -+ spice_common_server_dep_sources += ['generated_server_demarshallers.c'] -+ - spice_common_server_lib = static_library('spice-common-server', spice_common_server_sources, - install : false, - dependencies : spice_common_dep) + endif diff --git a/libs/spice/patches/040-only-server.patch b/libs/spice/patches/040-only-server.patch index dd2076fe4c..2c441806da 100644 --- a/libs/spice/patches/040-only-server.patch +++ b/libs/spice/patches/040-only-server.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -192,8 +192,6 @@ add_project_arguments(compiler.get_supported_arguments(spice_server_global_cflag +@@ -192,8 +192,6 @@ add_project_arguments(compiler.get_suppo # Subdirectories # subdir('server') @@ -11,7 +11,7 @@ # write config.h --- a/server/meson.build +++ b/server/meson.build -@@ -186,5 +186,3 @@ spice_server_libs = both_libraries('spice-server', spice_server_sources, +@@ -186,5 +186,3 @@ spice_server_libs = both_libraries('spic spice_server_shared_lib = spice_server_libs.get_shared_lib() spice_server_static_lib = spice_server_libs.get_static_lib() diff --git a/libs/spice/patches/050-no-mkenums.patch b/libs/spice/patches/050-no-mkenums.patch index 23cd486d22..3c2b69fbbe 100644 --- a/libs/spice/patches/050-no-mkenums.patch +++ b/libs/spice/patches/050-no-mkenums.patch @@ -10,8 +10,6 @@ Signed-off-by: Rosen Penev server/meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/server/meson.build b/server/meson.build -index b2eb410..b79b8d9 100644 --- a/server/meson.build +++ b/server/meson.build @@ -36,11 +36,7 @@ spice_server_headers = [ diff --git a/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch b/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch index 06081ce81d..4fe2c66301 100644 --- a/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch +++ b/libs/tdb/patches/100-Remove_libbsd_dependency_check.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -416,22 +416,13 @@ +@@ -416,22 +416,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -808,9 +799,6 @@ +@@ -808,9 +799,6 @@ def configure(conf): # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,7 +39,7 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -823,7 +811,7 @@ +@@ -823,7 +811,7 @@ def configure(conf): #include "tests/getifaddrs.c" ''' % method, method, @@ -48,7 +48,7 @@ addmain=False, execute=True): break -@@ -871,7 +859,6 @@ +@@ -871,7 +859,6 @@ def build(bld): break extra_libs = '' diff --git a/libs/tinycdb/patches/100-Makefile.patch b/libs/tinycdb/patches/100-Makefile.patch index 830d712048..f309a8e4f8 100644 --- a/libs/tinycdb/patches/100-Makefile.patch +++ b/libs/tinycdb/patches/100-Makefile.patch @@ -1,7 +1,6 @@ -diff -Naur tinycdb-0.78/Makefile tinycdb-0.78.patched/Makefile ---- tinycdb-0.78/Makefile 2012-05-11 18:17:47.000000000 +0400 -+++ tinycdb-0.78.patched/Makefile 2014-09-29 00:10:00.610836323 +0400 -@@ -86,17 +86,17 @@ +--- a/Makefile ++++ b/Makefile +@@ -86,17 +86,17 @@ $(PICLIB): $(LIB_OBJS_PIC) $(SHAREDLIB): $(LIB_OBJS_PIC) $(LIBMAP) -rm -f $(SOLIB) ln -s $@ $(SOLIB) diff --git a/libs/udns/patches/0001-use-autotools.patch b/libs/udns/patches/0001-use-autotools.patch index 5da20d8885..52cd5a22f3 100644 --- a/libs/udns/patches/0001-use-autotools.patch +++ b/libs/udns/patches/0001-use-autotools.patch @@ -1,5 +1,5 @@ ---- a/dev/null 2017-05-06 19:04:40.272000000 +0800 -+++ b/configure.ac 2017-05-13 20:56:26.761460807 +0800 +--- /dev/null ++++ b/configure.ac @@ -0,0 +1,56 @@ +# Copyright 2016 Yousong Zhou + @@ -57,8 +57,8 @@ + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT ---- a/dev/null 2016-01-04 02:31:18.900000000 +0800 -+++ b/Makefile.am 2016-02-22 20:12:01.938987311 +0800 +--- /dev/null ++++ b/Makefile.am @@ -0,0 +1,16 @@ +# Copyright 2016 Yousong Zhou + diff --git a/libs/uw-imap/patches/001-fix_Makefiles_and_shlib.patch b/libs/uw-imap/patches/001-fix_Makefiles_and_shlib.patch index cf0cc7f1bb..db83f98d53 100644 --- a/libs/uw-imap/patches/001-fix_Makefiles_and_shlib.patch +++ b/libs/uw-imap/patches/001-fix_Makefiles_and_shlib.patch @@ -1,6 +1,6 @@ ---- a/Makefile 2017-11-13 01:13:36.340236114 +0200 -+++ b/Makefile 2017-11-13 01:34:56.869682313 +0200 -@@ -638,10 +638,6 @@ +--- a/Makefile ++++ b/Makefile +@@ -638,10 +638,6 @@ ip6: @echo + yourself, try adding IP6=4 to the make command line. @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo @@ -11,7 +11,7 @@ @$(TOUCH) ip6 noip6: -@@ -678,20 +674,18 @@ +@@ -678,20 +674,18 @@ an ua: $(TOOLS)/$@ "$(LN)" src/tmail tmail $(LN) $(TOOLS)/$@ . @@ -34,9 +34,9 @@ $(TOUCH) rebuild rebuild: ---- a/src/osdep/unix/Makefile 2017-11-13 01:37:58.674011768 +0200 -+++ b/src/osdep/unix/Makefile 2017-11-13 03:30:18.204908962 +0200 -@@ -96,11 +96,11 @@ +--- a/src/osdep/unix/Makefile ++++ b/src/osdep/unix/Makefile +@@ -96,11 +96,11 @@ CHECKPW=std LOGINPW=std SIGTYPE=bsd CRXTYPE=std @@ -51,7 +51,7 @@ MD5PWD=/etc/cram-md5.pwd # Tries one of the test alternatives below if not specified. LOCKPGM= -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o @@ -60,7 +60,7 @@ CAT=cat MAKE=make -@@ -162,6 +162,16 @@ +@@ -162,6 +162,16 @@ MV=mv RM=rm -rf SH=sh @@ -77,7 +77,7 @@ # Primary build command -@@ -174,7 +184,7 @@ +@@ -174,7 +184,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA # Here if no make argument established missing: osdep.h @@ -86,7 +86,7 @@ osdep.h: @echo You must specify what type of system -@@ -674,7 +684,7 @@ +@@ -674,7 +684,7 @@ slx: # Secure Linux @echo You are building for libc6/glibc versions of Secure Linux @echo If you want libc5 versions you must use sl5 instead! @echo If you want libc4 versions you must use sl4 instead! @@ -95,7 +95,7 @@ SIGTYPE=psx CHECKPW=psx CRXTYPE=nfs \ SPOOLDIR=/var/spool \ ACTIVEFILE=/var/lib/news/active \ -@@ -863,7 +873,7 @@ +@@ -863,7 +873,7 @@ $(ARCHIVE): $(BINARIES) @$(SH) ARCHIVE .c.o: @@ -104,7 +104,7 @@ # Cleanup -@@ -922,8 +932,8 @@ +@@ -922,8 +932,8 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n @echo If you get No such file error messages for files x509.h, ssl.h, @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL @echo is not installed on your system. Either install OpenSSL first @@ -115,7 +115,7 @@ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c -@@ -962,21 +972,14 @@ +@@ -962,21 +972,14 @@ os_sol.h: # Once-only environment setup @@ -141,7 +141,7 @@ echo $(OS) > OSTYPE ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) -@@ -1055,7 +1058,6 @@ +@@ -1055,7 +1058,6 @@ sslsco: sbasic sldsco sbasic: # UNIX OpenSSL @echo Building with SSL $(LN) ssl_unix.c osdepssl.c @@ -149,7 +149,7 @@ echo " ssl_onceonlyinit ();" >> linkage.c snopwd: # Plaintext disable -@@ -1063,13 +1065,12 @@ +@@ -1063,13 +1065,12 @@ snopwd: # Plaintext disable echo " mail_parameters (NIL,SET_DISABLEPLAINTEXT,(void *) 2);" >> linkage.c sldunix:# Normal UNIX SSL load flags diff --git a/libs/uw-imap/patches/002-imap-2004a-doc.patch b/libs/uw-imap/patches/002-imap-2004a-doc.patch index dcae4ab8e6..fecf95d328 100644 --- a/libs/uw-imap/patches/002-imap-2004a-doc.patch +++ b/libs/uw-imap/patches/002-imap-2004a-doc.patch @@ -3,9 +3,9 @@ paths to imapd, ipop2d and ipop3d in the man pages. This patch is based on Red Hat Bugzilla ID #127271 and solves ID #229781. ---- imap-2004a/src/imapd/imapd.8 2004-05-18 19:46:54.000000000 +0200 -+++ imap-2004a/src/imapd/imapd.8.doc 2004-07-23 15:24:17.000000000 +0200 -@@ -3,7 +3,7 @@ +--- a/src/imapd/imapd.8 ++++ b/src/imapd/imapd.8 +@@ -16,7 +16,7 @@ .SH NAME IMAPd \- Internet Message Access Protocol server .SH SYNOPSIS @@ -14,9 +14,9 @@ This patch is based on Red Hat Bugzilla ID #127271 and solves ID #229781. .SH DESCRIPTION .I imapd is a server which supports the ---- imap-2004a/src/ipopd/ipopd.8 2004-05-18 19:50:05.000000000 +0200 -+++ imap-2004a/src/ipopd/ipopd.8.doc 2004-07-23 15:23:38.000000000 +0200 -@@ -3,9 +3,9 @@ +--- a/src/ipopd/ipopd.8 ++++ b/src/ipopd/ipopd.8 +@@ -16,9 +16,9 @@ .SH NAME IPOPd \- Post Office Protocol server .SH SYNOPSIS diff --git a/libs/uw-imap/patches/003-imap-2007e-overflow.patch b/libs/uw-imap/patches/003-imap-2007e-overflow.patch index 86512b29cf..48e473fcae 100644 --- a/libs/uw-imap/patches/003-imap-2007e-overflow.patch +++ b/libs/uw-imap/patches/003-imap-2007e-overflow.patch @@ -1,6 +1,5 @@ -diff -up imap-2007e/src/c-client/rfc822.c.overflow imap-2007e/src/c-client/rfc822.c ---- imap-2007e/src/c-client/rfc822.c.overflow 2008-12-12 11:08:26.000000000 -0600 -+++ imap-2007e/src/c-client/rfc822.c 2009-07-07 19:27:20.057772757 -0500 +--- a/src/c-client/rfc822.c ++++ b/src/c-client/rfc822.c @@ -384,6 +384,9 @@ void rfc822_parse_content (BODY *body,ST if (CHR (bs) == '\012'){/* following LF? */ c = SNX (bs); i--; /* yes, slurp it */ diff --git a/libs/uw-imap/patches/005-imap-2007e-authmd5.patch b/libs/uw-imap/patches/005-imap-2007e-authmd5.patch index 66883a17a8..0758dc139d 100644 --- a/libs/uw-imap/patches/005-imap-2007e-authmd5.patch +++ b/libs/uw-imap/patches/005-imap-2007e-authmd5.patch @@ -1,6 +1,5 @@ -diff -up imap-2007e/src/c-client/auth_md5.c.authmd5 imap-2007e/src/c-client/auth_md5.c ---- imap-2007e/src/c-client/auth_md5.c.authmd5 2008-06-04 13:18:34.000000000 -0500 -+++ imap-2007e/src/c-client/auth_md5.c 2009-07-07 19:24:12.348005485 -0500 +--- a/src/c-client/auth_md5.c ++++ b/src/c-client/auth_md5.c @@ -42,17 +42,17 @@ typedef struct { /* Prototypes */ diff --git a/libs/uw-imap/patches/006-imap-2007f-format-security.patch b/libs/uw-imap/patches/006-imap-2007f-format-security.patch index 244153e6d6..ce35b3b10f 100644 --- a/libs/uw-imap/patches/006-imap-2007f-format-security.patch +++ b/libs/uw-imap/patches/006-imap-2007f-format-security.patch @@ -1,7 +1,6 @@ -diff -Naur imap-2007f.orig/src/osdep/unix/flocklnx.c imap-2007f/src/osdep/unix/flocklnx.c ---- imap-2007f.orig/src/osdep/unix/flocklnx.c 2011-07-23 02:20:11.000000000 +0200 -+++ imap-2007f/src/osdep/unix/flocklnx.c 2014-04-14 19:17:46.429000000 +0200 -@@ -57,7 +57,7 @@ +--- a/src/osdep/unix/flocklnx.c ++++ b/src/osdep/unix/flocklnx.c +@@ -57,7 +57,7 @@ int safe_flock (int fd,int op) case ENOLCK: /* lock table is full */ sprintf (tmp,"File locking failure: %s",strerror (errno)); mm_log (tmp,WARN); /* give the user a warning of what happened */ diff --git a/libs/uw-imap/patches/007-imap-2007e-poll.patch b/libs/uw-imap/patches/007-imap-2007e-poll.patch index e25f1b6889..09487003ff 100644 --- a/libs/uw-imap/patches/007-imap-2007e-poll.patch +++ b/libs/uw-imap/patches/007-imap-2007e-poll.patch @@ -4,8 +4,6 @@ Description: Use poll(2) instead of select(2) to support more than 1024 file des Author: Ben Smithurst Bug-Debian: https://bugs.debian.org/478193 -diff --git a/src/osdep/unix/os_lnx.c b/src/osdep/unix/os_lnx.c -index 03fd17d..671bbd6 100644 --- a/src/osdep/unix/os_lnx.c +++ b/src/osdep/unix/os_lnx.c @@ -41,6 +41,7 @@ @@ -16,8 +14,6 @@ index 03fd17d..671bbd6 100644 #include "fs_unix.c" -diff --git a/src/osdep/unix/os_slx.c b/src/osdep/unix/os_slx.c -index c94d632..f6bf27d 100644 --- a/src/osdep/unix/os_slx.c +++ b/src/osdep/unix/os_slx.c @@ -42,6 +42,7 @@ extern int errno; /* just in case */ @@ -28,11 +24,9 @@ index c94d632..f6bf27d 100644 #include "fs_unix.c" -diff --git a/src/osdep/unix/tcp_unix.c b/src/osdep/unix/tcp_unix.c -index 795fb4f..c69eaec 100644 --- a/src/osdep/unix/tcp_unix.c +++ b/src/osdep/unix/tcp_unix.c -@@ -235,12 +235,11 @@ TCPSTREAM *tcp_open (char *host,char *service,unsigned long port) +@@ -235,12 +235,11 @@ TCPSTREAM *tcp_open (char *host,char *se int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port, char *tmp,int *ctr,char *hst) { @@ -47,7 +41,7 @@ index 795fb4f..c69eaec 100644 struct sockaddr *sadr = ip_sockaddr (family,adr,adrlen,port,&len); blocknotify_t bn = (blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL); /* fetid Solaris */ -@@ -252,14 +251,6 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port, +@@ -252,14 +251,6 @@ int tcp_socket_open (int family,void *ad sprintf (tmp,"Unable to create TCP socket: %s",strerror (errno)); (*bn) (BLOCK_NONSENSITIVE,data); } @@ -62,7 +56,7 @@ index 795fb4f..c69eaec 100644 else { /* get current socket flags */ flgs = fcntl (sock,F_GETFL,0); -@@ -284,16 +275,11 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port, +@@ -284,16 +275,11 @@ int tcp_socket_open (int family,void *ad if ((sock >= 0) && ctr) { /* want open timeout? */ now = time (0); /* open timeout */ ti = ttmo_open ? now + ttmo_open : 0; @@ -83,7 +77,7 @@ index 795fb4f..c69eaec 100644 now = time (0); /* fake timeout if interrupt & time expired */ if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0; } while ((i < 0) && (errno == EINTR)); -@@ -302,7 +288,7 @@ int tcp_socket_open (int family,void *adr,size_t adrlen,unsigned short port, +@@ -302,7 +288,7 @@ int tcp_socket_open (int family,void *ad fcntl (sock,F_SETFL,flgs); /* This used to be a zero-byte read(), but that crashes Solaris */ /* get socket status */ @@ -92,7 +86,7 @@ index 795fb4f..c69eaec 100644 } if (i <= 0) { /* timeout or error? */ i = i ? errno : ETIMEDOUT;/* determine error code */ -@@ -545,9 +531,8 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s) +@@ -545,9 +531,8 @@ long tcp_getbuffer (TCPSTREAM *stream,un stream->ictr -=n; } if (size) { @@ -104,7 +98,7 @@ index 795fb4f..c69eaec 100644 time_t t = time (0); blocknotify_t bn=(blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL); (*bn) (BLOCK_TCPREAD,NIL); -@@ -556,16 +541,13 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s) +@@ -556,16 +541,13 @@ long tcp_getbuffer (TCPSTREAM *stream,un time_t now = tl; time_t ti = ttmo_read ? now + ttmo_read : 0; if (tcpdebug) mm_log ("Reading TCP buffer",TCPDEBUG); @@ -126,7 +120,7 @@ index 795fb4f..c69eaec 100644 now = time (0); /* fake timeout if interrupt & time expired */ if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0; } while ((i < 0) && (errno == EINTR)); -@@ -605,9 +587,8 @@ long tcp_getbuffer (TCPSTREAM *stream,unsigned long size,char *s) +@@ -605,9 +587,8 @@ long tcp_getbuffer (TCPSTREAM *stream,un long tcp_getdata (TCPSTREAM *stream) { @@ -158,7 +152,7 @@ index 795fb4f..c69eaec 100644 now = time (0); /* fake timeout if interrupt & time expired */ if ((i < 0) && (errno == EINTR) && ti && (ti <= now)) i = 0; } while ((i < 0) && (errno == EINTR)); -@@ -677,9 +655,8 @@ long tcp_soutr (TCPSTREAM *stream,char *string) +@@ -677,9 +655,8 @@ long tcp_soutr (TCPSTREAM *stream,char * long tcp_sout (TCPSTREAM *stream,char *string,unsigned long size) { @@ -170,7 +164,7 @@ index 795fb4f..c69eaec 100644 time_t t = time (0); blocknotify_t bn = (blocknotify_t) mail_parameters (NIL,GET_BLOCKNOTIFY,NIL); if (stream->tcpso < 0) return NIL; -@@ -689,15 +666,12 @@ long tcp_sout (TCPSTREAM *stream,char *string,unsigned long size) +@@ -689,15 +666,12 @@ long tcp_sout (TCPSTREAM *stream,char *s time_t now = tl; time_t ti = ttmo_write ? now + ttmo_write : 0; if (tcpdebug) mm_log ("Writing to TCP",TCPDEBUG); diff --git a/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch b/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch index 1aa36ee22f..93482f903c 100644 --- a/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch +++ b/libs/uw-imap/patches/010-imap-2007f-openssl-1.1.patch @@ -12,8 +12,6 @@ Signed-off-by: Sebastian Andrzej Siewior src/osdep/unix/ssl_unix.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) -diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c -index 3bfdff3..836e9fa 100644 --- a/src/osdep/unix/ssl_unix.c +++ b/src/osdep/unix/ssl_unix.c @@ -59,7 +59,7 @@ typedef struct ssl_stream { @@ -25,7 +23,7 @@ index 3bfdff3..836e9fa 100644 static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat); static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size, long *contd); -@@ -210,6 +210,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) +@@ -210,6 +210,7 @@ static char *ssl_start_work (SSLSTREAM * BIO *bio; X509 *cert; unsigned long sl,tl; @@ -33,7 +31,7 @@ index 3bfdff3..836e9fa 100644 char *s,*t,*err,tmp[MAILTMPLEN]; sslcertificatequery_t scq = (sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL); -@@ -266,14 +267,19 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) +@@ -266,14 +267,19 @@ static char *ssl_start_work (SSLSTREAM * if (SSL_write (stream->con,"",0) < 0) return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; /* need to validate host names? */ @@ -60,7 +58,7 @@ index 3bfdff3..836e9fa 100644 } return NIL; } -@@ -313,7 +319,7 @@ static int ssl_open_verify (int ok,X509_STORE_CTX *ctx) +@@ -313,7 +319,7 @@ static int ssl_open_verify (int ok,X509_ * Returns: NIL if validated, else string of error message */ @@ -69,7 +67,7 @@ index 3bfdff3..836e9fa 100644 { int i,n; char *s,*t,*ret; -@@ -322,9 +328,9 @@ static char *ssl_validate_cert (X509 *cert,char *host) +@@ -322,9 +328,9 @@ static char *ssl_validate_cert (X509 *ce /* make sure have a certificate */ if (!cert) ret = "No certificate from server"; /* and that it has a name */ @@ -81,6 +79,3 @@ index 3bfdff3..836e9fa 100644 if (t = strchr (s += 4,'/')) *t = '\0'; /* host name matches pattern? */ ret = ssl_compare_hostnames (host,s) ? NIL : --- -2.9.3 - diff --git a/libs/uw-imap/patches/020-deprecated-openssl.patch b/libs/uw-imap/patches/020-deprecated-openssl.patch index 41ea0e5205..cd4d0f4e1d 100644 --- a/libs/uw-imap/patches/020-deprecated-openssl.patch +++ b/libs/uw-imap/patches/020-deprecated-openssl.patch @@ -1,5 +1,3 @@ -diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c -index 3bfdff3..3ed1cb5 100644 --- a/src/osdep/unix/ssl_unix.c +++ b/src/osdep/unix/ssl_unix.c @@ -35,6 +35,7 @@ diff --git a/libs/xmlrpc-c/patches/010-nanosleep.patch b/libs/xmlrpc-c/patches/010-nanosleep.patch index a40ceef9bf..52703cb206 100644 --- a/libs/xmlrpc-c/patches/010-nanosleep.patch +++ b/libs/xmlrpc-c/patches/010-nanosleep.patch @@ -9,7 +9,7 @@ #endif -@@ -18,6 +18,7 @@ xmlrpc_millisecond_sleep(unsigned int const milliseconds) { +@@ -18,6 +18,7 @@ xmlrpc_millisecond_sleep(unsigned int co #if MSVCRT SleepEx(milliseconds, true); #else diff --git a/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch b/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch index fd637eca55..21aa41f63c 100644 --- a/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch +++ b/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch @@ -1,11 +1,11 @@ --- a/reformatter/CMakeLists.txt +++ b/reformatter/CMakeLists.txt -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ ADD_EXECUTABLE(json_reformat ${SRCS}) -TARGET_LINK_LIBRARIES(json_reformat yajl_s) +TARGET_LINK_LIBRARIES(json_reformat yajl_s m) - # copy the binary into the output directory - GET_TARGET_PROPERTY(binPath json_reformat LOCATION) + # In some environments, we must explicitly link libm (like qnx, + # thanks @shahbag) diff --git a/libs/yajl/patches/101-link-perf-uclibc-libm.patch b/libs/yajl/patches/101-link-perf-uclibc-libm.patch index 0d6fd47958..797c4a7daf 100644 --- a/libs/yajl/patches/101-link-perf-uclibc-libm.patch +++ b/libs/yajl/patches/101-link-perf-uclibc-libm.patch @@ -1,6 +1,6 @@ --- a/perf/CMakeLists.txt +++ b/perf/CMakeLists.txt -@@ -20,4 +20,4 @@ +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ ADD_EXECUTABLE(perftest ${SRCS}) diff --git a/mail/dovecot/patches/001-configure_in.patch b/mail/dovecot/patches/001-configure_in.patch index 11c31b87ef..b01d5b6196 100644 --- a/mail/dovecot/patches/001-configure_in.patch +++ b/mail/dovecot/patches/001-configure_in.patch @@ -72,7 +72,7 @@ int f = open("conftest.mmap", O_RDWR|O_CREAT|O_TRUNC, 0600); --- a/m4/want_gssapi.m4 +++ b/m4/want_gssapi.m4 -@@ -54,7 +54,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [ +@@ -55,7 +55,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [ # does the kerberos library support SPNEGO? AC_CACHE_CHECK([whether GSSAPI supports SPNEGO],i_cv_gssapi_spnego,[ @@ -81,7 +81,7 @@ #ifdef HAVE_GSSAPI_H # include #else -@@ -62,6 +62,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [ +@@ -63,6 +63,7 @@ AC_DEFUN([DOVECOT_WANT_GSSAPI], [ #endif #include #include diff --git a/mail/dovecot/patches/100-openssl-deprecated.patch b/mail/dovecot/patches/100-openssl-deprecated.patch index e0d40e1e19..12b760d7c9 100644 --- a/mail/dovecot/patches/100-openssl-deprecated.patch +++ b/mail/dovecot/patches/100-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/src/lib-dcrypt/dcrypt-openssl.c +++ b/src/lib-dcrypt/dcrypt-openssl.c -@@ -20,6 +20,7 @@ +@@ -23,6 +23,7 @@ #include #include #include @@ -50,7 +50,7 @@ #include #include #include -@@ -514,8 +517,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX +@@ -555,8 +558,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX int nid; const char *curve_name; #endif diff --git a/mail/dovecot/patches/110-openssl-engine.patch b/mail/dovecot/patches/110-openssl-engine.patch index 6f8d47119c..57ce759784 100644 --- a/mail/dovecot/patches/110-openssl-engine.patch +++ b/mail/dovecot/patches/110-openssl-engine.patch @@ -1,6 +1,6 @@ --- a/src/lib-dcrypt/dcrypt-openssl.c +++ b/src/lib-dcrypt/dcrypt-openssl.c -@@ -17,10 +17,12 @@ +@@ -20,10 +20,12 @@ #include #include #include @@ -14,7 +14,7 @@ #include "dcrypt.h" #include "dcrypt-private.h" -@@ -179,11 +181,13 @@ static bool dcrypt_openssl_error(const c +@@ -235,11 +237,13 @@ dcrypt_openssl_padding_mode(enum dcrypt_ static bool dcrypt_openssl_initialize(const struct dcrypt_settings *set, const char **error_r) { diff --git a/mail/emailrelay/patches/010-openssl-1.1.patch b/mail/emailrelay/patches/010-openssl-1.1.patch index 5bba1abbb0..28523e7ee3 100644 --- a/mail/emailrelay/patches/010-openssl-1.1.patch +++ b/mail/emailrelay/patches/010-openssl-1.1.patch @@ -1,6 +1,6 @@ --- a/src/gssl/gssl_openssl.cpp +++ b/src/gssl/gssl_openssl.cpp -@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library +@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G m_verbose(verbose) , m_config(library_config) { diff --git a/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch b/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch index be914733c1..3d2f45d407 100644 --- a/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch +++ b/mail/fdm/patches/020-Fix-compile-with-OpenSSL-1.1.0.patch @@ -9,8 +9,6 @@ They're part of OPENSSL_init_ssl now. fdm.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/fdm.c b/fdm.c -index cdf8383..6721bbd 100644 --- a/fdm.c +++ b/fdm.c @@ -717,8 +717,10 @@ retry: @@ -24,6 +22,3 @@ index cdf8383..6721bbd 100644 /* Filter account list. */ TAILQ_INIT(&actaq); --- -2.17.1 - diff --git a/mail/fdm/patches/030-cdefs.patch b/mail/fdm/patches/030-cdefs.patch index 221d7d41af..d1ae7af3da 100644 --- a/mail/fdm/patches/030-cdefs.patch +++ b/mail/fdm/patches/030-cdefs.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Fix bas64 declarations, from makepost at firemail dot cc. fdm.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/fdm.h b/fdm.h -index 41eaa37..511a7b1 100644 --- a/fdm.h +++ b/fdm.h @@ -20,7 +20,6 @@ @@ -19,7 +17,7 @@ index 41eaa37..511a7b1 100644 #include #ifdef HAVE_QUEUE_H -@@ -725,8 +724,8 @@ size_t strlcat(char *, const char *, size_t); +@@ -725,8 +724,8 @@ size_t strlcat(char *, const char *, s #ifndef HAVE_B64_NTOP /* base64.c */ diff --git a/mail/greyfix/patches/100-ignore_cross_compile_test.patch b/mail/greyfix/patches/100-ignore_cross_compile_test.patch index fda272e2c1..41fc7603d7 100644 --- a/mail/greyfix/patches/100-ignore_cross_compile_test.patch +++ b/mail/greyfix/patches/100-ignore_cross_compile_test.patch @@ -1,6 +1,6 @@ ---- a/configure 2017-03-08 20:12:00.720885949 +0200 -+++ b/configure 2017-03-08 20:12:51.210722711 +0200 -@@ -4190,37 +4190,6 @@ +--- a/configure ++++ b/configure +@@ -4190,37 +4190,6 @@ _ACEOF fi diff --git a/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch b/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch index c18ef4efa3..f4be787ca7 100644 --- a/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch +++ b/mail/mailsend/patches/0001-OpenSSL-1.1-support-for-HMAC-api.patch @@ -7,11 +7,9 @@ Subject: [PATCH] OpenSSL 1.1 support for HMAC api utils.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/utils.c b/utils.c -index b072138..abfb86e 100755 --- a/utils.c +++ b/utils.c -@@ -791,8 +791,14 @@ char *encode_cram_md5(char *challenge,char *user,char *secret) +@@ -791,8 +791,14 @@ char *encode_cram_md5(char *challenge,ch unsigned char hmac_md5[16]; @@ -26,7 +24,7 @@ index b072138..abfb86e 100755 const EVP_MD *md5=NULL; -@@ -831,11 +837,20 @@ char *encode_cram_md5(char *challenge,char *user,char *secret) +@@ -831,11 +837,20 @@ char *encode_cram_md5(char *challenge,ch showVerbose("Challenge After decoding: %s\n",data); /* take HMAC-MD5 of the challenge*/ diff --git a/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch b/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch index b8c4eec30f..16ba32a27a 100644 --- a/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch +++ b/mail/mailsend/patches/0002-Removed-API-deprecated-by-OpenSSL-1.1.0.patch @@ -9,8 +9,6 @@ Signed-off-by: Eneas U de Queiroz utils.c | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) -diff --git a/main.c b/main.c -index d275e6a..51bfb1d 100755 --- a/main.c +++ b/main.c @@ -91,7 +91,11 @@ static void usage(void) @@ -40,8 +38,6 @@ index d275e6a..51bfb1d 100755 #endif /* ! HAVE_OPENSSL */ rc = 0; goto ExitProcessing; -diff --git a/utils.c b/utils.c -index abfb86e..02366c5 100755 --- a/utils.c +++ b/utils.c @@ -440,10 +440,12 @@ void initialize_openssl(char *cipher) @@ -58,7 +54,7 @@ index abfb86e..02366c5 100755 ssl_ctx=SSL_CTX_new(SSLv23_client_method()); if (ssl_ctx == NULL) { -@@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,char *user,char *secret) +@@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,ch return(NULL); showVerbose("Server Challenge: %s\n",challenge); @@ -68,6 +64,3 @@ index abfb86e..02366c5 100755 /* decode the challenge */ data=mutils_decode_base64((unsigned char *) challenge,strlen(challenge),&data_len); --- -2.19.1 - diff --git a/mail/nail/patches/010-remove-gssapi.patch b/mail/nail/patches/010-remove-gssapi.patch index e88d356288..f56297622f 100644 --- a/mail/nail/patches/010-remove-gssapi.patch +++ b/mail/nail/patches/010-remove-gssapi.patch @@ -1,12 +1,9 @@ -diff --git a/makeconfig b/makeconfig -index 0ab36b8..ee1e3a1 100644 --- a/makeconfig +++ b/makeconfig -@@ -413,47 +413,6 @@ int main(void) - ! +@@ -414,47 +414,6 @@ int main(void) fi --cat >$tmp2.c <<\! + cat >$tmp2.c <<\! -#include - -int main(void) @@ -47,6 +44,7 @@ index 0ab36b8..ee1e3a1 100644 -} -% - - cat >$tmp2.c <<\! +-cat >$tmp2.c <<\! #include "config.h" #ifdef HAVE_NL_LANGINFO + #include diff --git a/mail/nail/patches/300-openssl-deprecated.patch b/mail/nail/patches/300-openssl-deprecated.patch index 8ba69adabf..d78a6e05a1 100644 --- a/mail/nail/patches/300-openssl-deprecated.patch +++ b/mail/nail/patches/300-openssl-deprecated.patch @@ -10,7 +10,7 @@ initialized = 1; } if (rand_init == 0) -@@ -215,12 +217,13 @@ ssl_verify_cb(int success, X509_STORE_CTX *store) +@@ -215,12 +217,13 @@ ssl_verify_cb(int success, X509_STORE_CT static const SSL_METHOD * ssl_select_method(const char *uhp) { diff --git a/mail/opendkim/patches/020-uclibc.patch b/mail/opendkim/patches/020-uclibc.patch index b74c3a99e3..34da7f4b53 100644 --- a/mail/opendkim/patches/020-uclibc.patch +++ b/mail/opendkim/patches/020-uclibc.patch @@ -10,7 +10,7 @@ int n; int ret; struct dkim_res_qh *rq; -@@ -209,6 +212,7 @@ dkim_res_query(void *srv, int type, unsigned char *query, unsigned char *buf, +@@ -209,6 +212,7 @@ dkim_res_query(void *srv, int type, unsi *qh = (void *) rq; return DKIM_DNS_SUCCESS; diff --git a/mail/sendmail/patches/010-enable-nonroot-install.patch b/mail/sendmail/patches/010-enable-nonroot-install.patch index ff6e8b3017..6093b6d6c9 100644 --- a/mail/sendmail/patches/010-enable-nonroot-install.patch +++ b/mail/sendmail/patches/010-enable-nonroot-install.patch @@ -1,7 +1,5 @@ -Index: sendmail-8.15.2/cf/cf/Makefile -=================================================================== ---- sendmail-8.15.2.orig/cf/cf/Makefile -+++ sendmail-8.15.2/cf/cf/Makefile +--- a/cf/cf/Makefile ++++ b/cf/cf/Makefile @@ -80,10 +80,10 @@ install: install-cf: install-sendmail-cf install-submit-cf diff --git a/mail/sendmail/patches/011-libmilter-so-version.patch b/mail/sendmail/patches/011-libmilter-so-version.patch index fdd5eee114..3b4df034bd 100644 --- a/mail/sendmail/patches/011-libmilter-so-version.patch +++ b/mail/sendmail/patches/011-libmilter-so-version.patch @@ -1,7 +1,5 @@ -Index: sendmail-8.15.2/libmilter/Makefile.m4 -=================================================================== ---- sendmail-8.15.2.orig/libmilter/Makefile.m4 -+++ sendmail-8.15.2/libmilter/Makefile.m4 +--- a/libmilter/Makefile.m4 ++++ b/libmilter/Makefile.m4 @@ -9,7 +9,10 @@ define(`confMT', `true') SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') diff --git a/mail/sendmail/patches/102-pthreads-stack-size.patch b/mail/sendmail/patches/102-pthreads-stack-size.patch index a2e10d6d04..aec19bffdf 100644 --- a/mail/sendmail/patches/102-pthreads-stack-size.patch +++ b/mail/sendmail/patches/102-pthreads-stack-size.patch @@ -12,10 +12,8 @@ above. Also, a bug report has been filed upstream: https://sourceforge.net/p/opendkim/bugs/258/ -Index: sendmail-8.15.2/libmilter/libmilter.h -=================================================================== ---- sendmail-8.15.2.orig/libmilter/libmilter.h -+++ sendmail-8.15.2/libmilter/libmilter.h +--- a/libmilter/libmilter.h ++++ b/libmilter/libmilter.h @@ -127,10 +127,10 @@ struct smfi_str # define MI_SOCK_READ(s, b, l) read(s, b, l) # define MI_SOCK_READ_FAIL(x) ((x) < 0) @@ -29,10 +27,8 @@ Index: sendmail-8.15.2/libmilter/libmilter.h typedef pthread_mutex_t smutex_t; # define smutex_init(mp) (pthread_mutex_init(mp, NULL) == 0) # define smutex_destroy(mp) (pthread_mutex_destroy(mp) == 0) -Index: sendmail-8.15.2/libmilter/main.c -=================================================================== ---- sendmail-8.15.2.orig/libmilter/main.c -+++ sendmail-8.15.2/libmilter/main.c +--- a/libmilter/main.c ++++ b/libmilter/main.c @@ -16,6 +16,12 @@ SM_RCSID("@(#)$Id: main.c,v 8.85 2013-11 #include #include diff --git a/multimedia/ffmpeg/patches/010-pkgconfig.patch b/multimedia/ffmpeg/patches/010-pkgconfig.patch index 48635e169a..3cc46a25f6 100644 --- a/multimedia/ffmpeg/patches/010-pkgconfig.patch +++ b/multimedia/ffmpeg/patches/010-pkgconfig.patch @@ -1,6 +1,6 @@ --- a/ffbuild/pkgconfig_generate.sh +++ b/ffbuild/pkgconfig_generate.sh -@@ -28,9 +28,9 @@ version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2) +@@ -28,9 +28,9 @@ version=$(grep ${name}_VERSION= $name/${ cat < $name/$fullname.pc prefix=$prefix diff --git a/multimedia/ffmpeg/patches/030-h264-mips.patch b/multimedia/ffmpeg/patches/030-h264-mips.patch index 53ec3369d8..732b1a15c8 100644 --- a/multimedia/ffmpeg/patches/030-h264-mips.patch +++ b/multimedia/ffmpeg/patches/030-h264-mips.patch @@ -8,7 +8,7 @@ #define get_cabac_inline get_cabac_inline_mips static av_always_inline int get_cabac_inline_mips(CABACContext *c, uint8_t * const state){ -@@ -116,4 +117,5 @@ static av_always_inline int get_cabac_inline_mips(CABACContext *c, +@@ -116,4 +117,5 @@ static av_always_inline int get_cabac_in return bit; } diff --git a/multimedia/ffmpeg/patches/050-glibc.patch b/multimedia/ffmpeg/patches/050-glibc.patch index 870a87ad07..a21acf4d0a 100644 --- a/multimedia/ffmpeg/patches/050-glibc.patch +++ b/multimedia/ffmpeg/patches/050-glibc.patch @@ -1,9 +1,9 @@ --- a/libavcodec/wmv2dsp.c +++ b/libavcodec/wmv2dsp.c -@@ -263,6 +263,6 @@ av_cold void ff_wmv2dsp_init(WMV2DSPContext *c) +@@ -263,6 +263,6 @@ av_cold void ff_wmv2dsp_init(WMV2DSPCont c->put_mspel_pixels_tab[6] = put_mspel8_mc22_c; c->put_mspel_pixels_tab[7] = put_mspel8_mc32_c; - + - if (ARCH_MIPS) + if (ARCH_MIPS64) ff_wmv2dsp_init_mips(c); diff --git a/multimedia/grilo-plugins/patches/001-no-help-po-tests.patch b/multimedia/grilo-plugins/patches/001-no-help-po-tests.patch index ee2ad62c4a..9d069b8f10 100644 --- a/multimedia/grilo-plugins/patches/001-no-help-po-tests.patch +++ b/multimedia/grilo-plugins/patches/001-no-help-po-tests.patch @@ -3,10 +3,9 @@ Fix build error on OpenWrt build servers. See: https://github.com/openwrt/packages/pull/10433#issuecomment-549242840 https://github.com/mesonbuild/meson/issues/821 -diff -u --recursive grilo-plugins-0.3.10-vanilla/meson.build grilo-plugins-0.3.10/meson.build ---- grilo-plugins-0.3.10-vanilla/meson.build 2019-09-12 11:48:29.000000000 -0400 -+++ grilo-plugins-0.3.10/meson.build 2020-01-20 11:17:22.803149935 -0500 -@@ -192,6 +192,3 @@ +--- a/meson.build ++++ b/meson.build +@@ -192,6 +192,3 @@ gnome = import('gnome') rootdir = include_directories('.') subdir('src') diff --git a/multimedia/gst1-libav/patches/010-distutils.patch b/multimedia/gst1-libav/patches/010-distutils.patch index 2ad4627c01..057059869f 100644 --- a/multimedia/gst1-libav/patches/010-distutils.patch +++ b/multimedia/gst1-libav/patches/010-distutils.patch @@ -1,8 +1,8 @@ --- a/meson.build +++ b/meson.build -@@ -188,5 +188,5 @@ plugins = [] - subdir('ext/libav') - subdir('docs') +@@ -202,5 +202,5 @@ endif + + configure_file(output: 'config.h', configuration: cdata) -python3 = import('python').find_installation() +python3 = 'python3' diff --git a/multimedia/gst1-plugins-bad/patches/010-distutils.patch b/multimedia/gst1-plugins-bad/patches/010-distutils.patch index d7a17667d9..39ffbd3033 100644 --- a/multimedia/gst1-plugins-bad/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-bad/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -417,7 +417,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H'] +@@ -441,7 +441,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H configinc = include_directories('.') libsinc = include_directories('gst-libs') diff --git a/multimedia/gst1-plugins-base/patches/010-distutils.patch b/multimedia/gst1-plugins-base/patches/010-distutils.patch index 77f9c3f624..e0806119cc 100644 --- a/multimedia/gst1-plugins-base/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-base/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -407,7 +407,7 @@ if get_option('default_library') == 'shared' +@@ -431,7 +431,7 @@ if get_option('default_library') == 'sha plugins_pkgconfig_install_dir = disabler() endif diff --git a/multimedia/gst1-plugins-good/patches/010-distutils.patch b/multimedia/gst1-plugins-good/patches/010-distutils.patch index 713c1a5358..ae39b912ec 100644 --- a/multimedia/gst1-plugins-good/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-good/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -400,7 +400,7 @@ endif +@@ -424,7 +424,7 @@ endif presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets') diff --git a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch index 1460bb3d2f..142cb2d79c 100644 --- a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -257,7 +257,7 @@ if get_option('default_library') == 'shared' +@@ -257,7 +257,7 @@ if get_option('default_library') == 'sha plugins_pkgconfig_install_dir = disabler() endif diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index 11ea465561..910bc26a70 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,6 +1,6 @@ --- a/gst/gstplugin.c +++ b/gst/gstplugin.c -@@ -790,15 +790,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename, +@@ -790,15 +790,8 @@ _priv_gst_plugin_load_file_for_registry } #endif diff --git a/multimedia/gstreamer1/patches/020-distutils.patch b/multimedia/gstreamer1/patches/020-distutils.patch index d072c11bfc..e530f24617 100644 --- a/multimedia/gstreamer1/patches/020-distutils.patch +++ b/multimedia/gstreamer1/patches/020-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -505,7 +505,7 @@ if get_option('default_library') == 'static' +@@ -522,7 +522,7 @@ if get_option('default_library') == 'sta endif # Used in gst/parse/meson.build and below diff --git a/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch b/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch index b24de8c63a..9bd67651e2 100644 --- a/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch +++ b/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch @@ -1,6 +1,6 @@ --- a/m4/ogg.m4 +++ b/m4/ogg.m4 -@@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include],, +@@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include] ]) AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg, [dnl @@ -9,11 +9,9 @@ # # check if the installed Ogg is sufficiently new. -diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 -index 17add29..066dc2a 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 -@@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_prefix"; then +@@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref ]) fi @@ -26,7 +24,7 @@ index 17add29..066dc2a 100644 xt_save_LIBS="$LIBS" xt_save_LDFLAGS="$LDFLAGS" -@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_lib_vorbis=ok], +@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li ) ]) @@ -64,7 +62,7 @@ index 17add29..066dc2a 100644 typedef struct vorbis_codec_tag { -@@ -583,3 +584,91 @@ static refbuf_t *process_vorbis_page (ogg_state_t *ogg_info, +@@ -583,3 +584,91 @@ static refbuf_t *process_vorbis_page (og return NULL; } diff --git a/multimedia/icecast/patches/005-no_examples_doc_win32.patch b/multimedia/icecast/patches/005-no_examples_doc_win32.patch index 43c6266c46..178df546bc 100644 --- a/multimedia/icecast/patches/005-no_examples_doc_win32.patch +++ b/multimedia/icecast/patches/005-no_examples_doc_win32.patch @@ -9,7 +9,7 @@ EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \ m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \ -@@ -11,7 +11,7 @@ EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \ +@@ -11,7 +11,7 @@ EXTRA_DIST = HACKING m4/acx_pthread.m4 m m4/xiph_types.m4 m4/xiph_xml2.m4 docdir = $(datadir)/doc/$(PACKAGE) diff --git a/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch b/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch index ad17922688..8da6e33b65 100644 --- a/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch +++ b/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch @@ -1,6 +1,6 @@ --- a/m4/xiph_curl.m4 +++ b/m4/xiph_curl.m4 -@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok="no") +@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok AC_MSG_CHECKING(for libcurl) if test "$curl_ok" = "yes" then diff --git a/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch b/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch index f695389a37..565e747300 100644 --- a/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch +++ b/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch @@ -20,6 +20,5 @@ -add_subdirectory(plugins/output_viewer) +#add_subdirectory(plugins/output_viewer) add_subdirectory(plugins/output_zmqserver) - + # - # mjpg_streamer executable diff --git a/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch b/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch index 0e5a151389..a8bc194c52 100644 --- a/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch +++ b/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch @@ -3,11 +3,11 @@ @@ -49,8 +49,7 @@ set (MJPG_STREAMER_PLUGIN_INSTALL_PATH " # Global dependencies # - + -find_library(JPEG_LIB jpeg) - +#find_library(JPEG_LIB jpeg) - + # # Input plugins --- a/plugins/input_uvc/CMakeLists.txt diff --git a/multimedia/tvheadend/patches/020-strncpy-issue.patch b/multimedia/tvheadend/patches/020-strncpy-issue.patch index e9dc910670..a8bb88d20c 100644 --- a/multimedia/tvheadend/patches/020-strncpy-issue.patch +++ b/multimedia/tvheadend/patches/020-strncpy-issue.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index 8c5e380..baef144 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ PROG := $(BUILDDIR)/tvheadend diff --git a/multimedia/tvheadend/patches/030-gcc10.patch b/multimedia/tvheadend/patches/030-gcc10.patch index 8358f99b8a..53a2b0e9e8 100644 --- a/multimedia/tvheadend/patches/030-gcc10.patch +++ b/multimedia/tvheadend/patches/030-gcc10.patch @@ -1,6 +1,6 @@ --- a/src/input.h +++ b/src/input.h -@@ -120,8 +120,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); +@@ -120,8 +120,8 @@ void tvh_hardware_delete ( tvh_hardware_ extern const idclass_t tvh_input_class; extern const idclass_t tvh_input_instance_class; diff --git a/multimedia/xupnpd/patches/100-default_config.patch b/multimedia/xupnpd/patches/100-default_config.patch index dee21a9972..b459735d9d 100644 --- a/multimedia/xupnpd/patches/100-default_config.patch +++ b/multimedia/xupnpd/patches/100-default_config.patch @@ -1,7 +1,7 @@ --- a/src/xupnpd.lua +++ b/src/xupnpd.lua -@@ -1,10 +1,10 @@ - cfg={} +@@ -5,10 +5,10 @@ cfg.ui_auth_file='auth.txt' + cfg.ui_session_file='/tmp/xupnpd.session' -- multicast interface for SSDP exchange, 'eth0', 'br0', 'br-lan' for example -cfg.ssdp_interface='lo' diff --git a/net/aggregate/patches/500-cross_compile_flags.patch b/net/aggregate/patches/500-cross_compile_flags.patch index b7392fbb0f..66feaf05ab 100644 --- a/net/aggregate/patches/500-cross_compile_flags.patch +++ b/net/aggregate/patches/500-cross_compile_flags.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -25,8 +25,9 @@ +@@ -25,8 +25,9 @@ CC = @CC@ INSTALL = @INSTALL@ DEFS = @DEFS@ LIBS = @LIBS@ diff --git a/net/apache/patches/020-openssl-deprecated.patch b/net/apache/patches/020-openssl-deprecated.patch index c9794384e1..667a24c68e 100644 --- a/net/apache/patches/020-openssl-deprecated.patch +++ b/net/apache/patches/020-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c -@@ -708,23 +708,23 @@ const char *md_cert_get_serial_number(const md_cert_t *cert, apr_pool_t *p) +@@ -708,23 +708,23 @@ const char *md_cert_get_serial_number(co int md_cert_is_valid_now(const md_cert_t *cert) { @@ -31,7 +31,7 @@ int md_cert_covers_domain(md_cert_t *cert, const char *domain_name) --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c -@@ -226,7 +226,7 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, +@@ -226,7 +226,7 @@ apr_status_t ssl_init_Module(apr_pool_t apr_status_t rv; apr_array_header_t *pphrases; @@ -42,7 +42,7 @@ "a newer library (%s, version currently loaded is %s)" --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c -@@ -1255,9 +1255,9 @@ static apr_status_t ssl_io_filter_handshake(ssl_filter_ctx_t *filter_ctx) +@@ -1255,9 +1255,9 @@ static apr_status_t ssl_io_filter_handsh if (dc->proxy->ssl_check_peer_expire != FALSE) { if (!cert || (X509_cmp_current_time( @@ -56,7 +56,7 @@ "SSL Proxy: Peer certificate is expired"); --- a/modules/ssl/ssl_engine_log.c +++ b/modules/ssl/ssl_engine_log.c -@@ -161,10 +161,10 @@ static void ssl_log_cert_error(const char *file, int line, int level, +@@ -161,10 +161,10 @@ static void ssl_log_cert_error(const cha BIO_puts(bio, "(ERROR)"); BIO_puts(bio, " / notbefore: "); @@ -71,7 +71,7 @@ --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c -@@ -490,13 +490,13 @@ static char *ssl_var_lookup_ssl_cert(apr_pool_t *p, request_rec *r, X509 *xs, +@@ -490,13 +490,13 @@ static char *ssl_var_lookup_ssl_cert(apr result = ssl_var_lookup_ssl_cert_serial(p, xs); } else if (strcEQ(var, "V_START")) { @@ -102,7 +102,7 @@ * when the user points at an explicit non-engine flavor of OpenSSL --- a/support/ab.c +++ b/support/ab.c -@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio, X509 *cert) +@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); BIO_printf(bio,"Valid from: "); @@ -116,7 +116,7 @@ BIO_printf(bio,"\n"); pk = X509_get_pubkey(cert); -@@ -2634,8 +2634,10 @@ int main(int argc, const char * const argv[]) +@@ -2634,8 +2634,10 @@ int main(int argc, const char * const ar CRYPTO_malloc_init(); #endif #endif diff --git a/net/apcupsd/patches/010-fix-usb.patch b/net/apcupsd/patches/010-fix-usb.patch index b313bb22fb..0954e16f37 100644 --- a/net/apcupsd/patches/010-fix-usb.patch +++ b/net/apcupsd/patches/010-fix-usb.patch @@ -1,5 +1,5 @@ ---- a/include/libusb.h.in.orig 2015-02-21 18:53:51.023682068 +0100 -+++ a/include/libusb.h.in 2015-02-21 18:54:14.722788757 +0100 +--- a/include/libusb.h.in ++++ b/include/libusb.h.in @@ -6,4 +6,4 @@ * path at configure time and various apcupsd bits include this * when they need libusb's usb.h. diff --git a/net/apcupsd/patches/015-drop-doc.patch b/net/apcupsd/patches/015-drop-doc.patch index fb90b22c0a..ff2144d237 100644 --- a/net/apcupsd/patches/015-drop-doc.patch +++ b/net/apcupsd/patches/015-drop-doc.patch @@ -1,10 +1,10 @@ ---- a/Makefile.orig 2019-04-04 18:19:45.007668656 +0200 -+++ a/Makefile 2019-04-04 18:23:00.723165465 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,6 +1,6 @@ topdir:=. - + -SUBDIRS=src platforms doc +SUBDIRS=src platforms include autoconf/targets.mak - + # Force platforms/ to build after src/ diff --git a/net/beanstalkd/patches/900-makefile.patch b/net/beanstalkd/patches/900-makefile.patch index f948851e23..3cac7178b8 100644 --- a/net/beanstalkd/patches/900-makefile.patch +++ b/net/beanstalkd/patches/900-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index a3f345f..fe5a083 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,16 @@ @@ -91,7 +89,7 @@ index a3f345f..fe5a083 100644 bench: ct/_ctcheck ct/_ctcheck -b -@@ -88,11 +79,8 @@ ct/ct.o ct/_ctcheck.o: ct/ct.h ct/internal.h +@@ -88,11 +79,8 @@ ct/ct.o ct/_ctcheck.o: ct/ct.h ct/intern $(TOFILES): $(HFILES) ct/ct.h @@ -104,7 +102,7 @@ index a3f345f..fe5a083 100644 vers.c: ./verc.sh >vers.c -@@ -100,3 +88,9 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: doc/beanstalkd.ronn +@@ -100,3 +88,9 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: ronn $< freebsd.o: darwin.c diff --git a/net/beanstalkd/patches/901-fix-headers.patch b/net/beanstalkd/patches/901-fix-headers.patch index ba6de6d787..3c97abce7c 100644 --- a/net/beanstalkd/patches/901-fix-headers.patch +++ b/net/beanstalkd/patches/901-fix-headers.patch @@ -1,5 +1,5 @@ ---- a/sd-daemon.c 2017-02-16 18:50:20.000000000 -0700 -+++ b/sd-daemon.c 2017-02-16 19:21:09.086008361 -0700 +--- a/sd-daemon.c ++++ b/sd-daemon.c @@ -32,7 +32,7 @@ #include #include diff --git a/net/beanstalkd/patches/902-replace-posix_fallocate.patch b/net/beanstalkd/patches/902-replace-posix_fallocate.patch index 18b07c1880..3371ff438a 100644 --- a/net/beanstalkd/patches/902-replace-posix_fallocate.patch +++ b/net/beanstalkd/patches/902-replace-posix_fallocate.patch @@ -7,7 +7,7 @@ #include #include #include -@@ -19,7 +19,7 @@ static int epfd; +@@ -19,7 +21,7 @@ static int epfd; int rawfalloc(int fd, int len) { diff --git a/net/boinc/patches/001-avoidExtraDependencies b/net/boinc/patches/001-avoidExtraDependencies index ee914978b6..e70997b49a 100644 --- a/net/boinc/patches/001-avoidExtraDependencies +++ b/net/boinc/patches/001-avoidExtraDependencies @@ -1,7 +1,5 @@ -Index: boinc-client_release-7.16-7.16.5/configure.ac -=================================================================== ---- boinc-client_release-7.16-7.16.5.orig/configure.ac -+++ boinc-client_release-7.16-7.16.5/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -506,8 +506,10 @@ SAH_CHECK_LIB([dl], [dlopen], [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) SAH_CHECK_LIB([nsl], [gethostbyname], diff --git a/net/boinc/patches/002-hosttypeRespected b/net/boinc/patches/002-hosttypeRespected index 6702b572e1..b40271c08c 100644 --- a/net/boinc/patches/002-hosttypeRespected +++ b/net/boinc/patches/002-hosttypeRespected @@ -1,7 +1,5 @@ -Index: boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp -=================================================================== ---- boinc-client_release-7.16-7.16.6.orig/client/cs_platforms.cpp -+++ boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp +--- a/client/cs_platforms.cpp ++++ b/client/cs_platforms.cpp @@ -76,6 +76,21 @@ void CLIENT_STATE::add_platform(const ch // void CLIENT_STATE::detect_platforms() { diff --git a/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch b/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch index da9ae7040c..c4cc24dd22 100644 --- a/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch +++ b/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch @@ -22,8 +22,6 @@ See also: src/process.c | 28 ++++++++++++++-------------- 5 files changed, 37 insertions(+), 37 deletions(-) -diff --git a/src/bwm-ng.c b/src/bwm-ng.c -index ad94ccd..c2ab0db 100644 --- a/src/bwm-ng.c +++ b/src/bwm-ng.c @@ -26,7 +26,7 @@ @@ -44,8 +42,6 @@ index ad94ccd..c2ab0db 100644 if_count=0; delay=500; #if EXTENDED_STATS -diff --git a/src/help.c b/src/help.c -index 7fd9ca4..4853297 100644 --- a/src/help.c +++ b/src/help.c @@ -24,9 +24,9 @@ @@ -60,11 +56,9 @@ index 7fd9ca4..4853297 100644 #ifdef LONG_OPTIONS printf(" %-23s",long_c); #else -diff --git a/src/options.c b/src/options.c -index 1b65eeb..30dccb4 100644 --- a/src/options.c +++ b/src/options.c -@@ -30,12 +30,12 @@ static char* getToken(char** str, const char* delims); +@@ -30,12 +30,12 @@ static char* getToken(char** str, const char *trim_whitespace(char *str); int read_config(const char *config_file); #endif @@ -81,7 +75,7 @@ index 1b65eeb..30dccb4 100644 #ifdef CONFIG_FILE /****************************************************************************** -@@ -65,7 +65,7 @@ static char* getToken(char** str, const char* delims) { +@@ -65,7 +65,7 @@ static char* getToken(char** str, const /******************************************************************************/ #endif @@ -90,7 +84,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; if (!strcasecmp(optarg,"bits")) return BITS_OUT; -@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg) { +@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg) } #if EXTENDED_STATS @@ -99,7 +93,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"rate")) return RATE_OUT; if (!strcasecmp(optarg,"max")) return MAX_OUT; -@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg) { +@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg) } #endif @@ -108,7 +102,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; #ifdef HAVE_CURSES -@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg) { +@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg) } @@ -117,8 +111,6 @@ index 1b65eeb..30dccb4 100644 if (optarg) { #ifdef PROC_NET_DEV if (!strcasecmp(optarg,"proc")) return PROC_IN; -diff --git a/src/output.c b/src/output.c -index 653e444..1425b3c 100644 --- a/src/output.c +++ b/src/output.c @@ -25,13 +25,13 @@ @@ -140,7 +132,7 @@ index 653e444..1425b3c 100644 char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); inline static const char *output_type2str(void) { -@@ -59,7 +59,7 @@ inline static const char *output_type2str(void) { +@@ -59,7 +59,7 @@ inline static const char *output_type2st } @@ -167,7 +159,7 @@ index 653e444..1425b3c 100644 switch (mode) { case 0: return stats.in; -@@ -275,7 +275,7 @@ inline ullong direction2value(char mode,struct inout_long stats) { +@@ -275,7 +275,7 @@ inline ullong direction2value(char mode, } #if EXTENDED_STATS @@ -176,7 +168,7 @@ index 653e444..1425b3c 100644 switch (mode) { case 0: return (double)(stats.in/items); -@@ -288,7 +288,7 @@ inline double direction_max2value(char mode,struct inouttotal_double stats,int i +@@ -288,7 +288,7 @@ inline double direction_max2value(char m } #endif @@ -185,7 +177,7 @@ index 653e444..1425b3c 100644 if (dynamic) { if (value<1024) snprintf(str,buf_size,"%15.2f ",value); -@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double value,char *str,int buf_size) { +@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double v return str; } @@ -194,8 +186,6 @@ index 653e444..1425b3c 100644 if (dynamic) { if (value<1000) snprintf(str,buf_size,"%15.2f ",value); -diff --git a/src/process.c b/src/process.c -index 59eccf0..d06c6dd 100644 --- a/src/process.c +++ b/src/process.c @@ -26,19 +26,19 @@ @@ -225,7 +215,7 @@ index 59eccf0..d06c6dd 100644 #endif /* returns the whether to show the iface or not -@@ -74,7 +74,7 @@ short show_iface(char *instr, char *searchstr,char iface_is_up) { +@@ -74,7 +74,7 @@ short show_iface(char *instr, char *sear #if HAVE_GETTIMEOFDAY /* Returns: the time difference in milliseconds. */ @@ -234,7 +224,7 @@ index 59eccf0..d06c6dd 100644 return labs((newer.tv_sec-older.tv_sec)*1000+ (newer.tv_usec-older.tv_usec)/1000); } -@@ -95,7 +95,7 @@ float get_time_delay(int iface_num) { +@@ -92,7 +92,7 @@ float get_time_delay(int iface_num) { #endif /* basically new-old, but handles "overflow" of source aswell */ @@ -243,7 +233,7 @@ index 59eccf0..d06c6dd 100644 /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ return (new>=old) ? (ullong)(new-old) : (ullong)(( #ifdef HAVE_LIBKSTAT -@@ -136,13 +136,13 @@ t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_ +@@ -133,13 +133,13 @@ t_iface_speed_stats convert2calced_disk_ #if EXTENDED_STATS /* sub old values from cached for avg stats */ @@ -259,7 +249,7 @@ index 59eccf0..d06c6dd 100644 values->in+=data.in; values->out+=data.out; values->total+=data.total; -@@ -151,7 +151,7 @@ inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_do +@@ -148,7 +148,7 @@ inline void add_avg_values(struct inoutt /* put new-old bytes in inout_long struct into a inouttotal_double struct * and add values to cached .value struct */ @@ -268,7 +258,7 @@ index 59eccf0..d06c6dd 100644 data->in=calced_stats.in*multiplier; data->out=calced_stats.out*multiplier; data->total=(calced_stats.in+calced_stats.out)*multiplier; -@@ -201,13 +201,13 @@ void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float mult +@@ -198,13 +198,13 @@ void save_avg(struct t_avg *avg,struct i } /* add current in and out bytes to totals struct */ diff --git a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch index 44a644dd9e..38acd1cacb 100644 --- a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch +++ b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch @@ -7,8 +7,6 @@ Subject: [PATCH] OpenSSL 1.1.0 compile fix. crypto.c | 53 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 18 deletions(-) -diff --git a/crypto.c b/crypto.c -index e476611..e8b72d3 100644 --- a/crypto.c +++ b/crypto.c @@ -46,6 +46,10 @@ openssl dgst \ @@ -22,7 +20,7 @@ index e476611..e8b72d3 100644 EVP_PKEY * crypto_load_key(const char *key, const bool is_private) { -@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct strin { int err; bool retval; @@ -31,7 +29,7 @@ index e476611..e8b72d3 100644 EVP_PKEY *pkey; /* load public key into openssl structure */ -@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct strin log_err("crypto_verify_signature: key loading failed\n"); return false; } @@ -58,7 +56,7 @@ index e476611..e8b72d3 100644 EVP_PKEY_free(pkey); if (err != 1) { -@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct strin retval = true; bailout_ctx_cleanup: @@ -67,7 +65,7 @@ index e476611..e8b72d3 100644 //log_info("Signature Verified Ok.\n"); return retval; -@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *ciphertext, const char *privkey, struct string +@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *cipher len = RSA_private_decrypt(string_length(ciphertext), (unsigned char*)string_get(ciphertext), (unsigned char*)string_get(decrypted), @@ -118,7 +116,7 @@ index e476611..e8b72d3 100644 goto bail_out; } -@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -127,7 +125,7 @@ index e476611..e8b72d3 100644 &decryptdone, (unsigned char*)string_get(ciphertext), string_length(ciphertext))) { /* TODO: need cleaner way: */ -@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -136,7 +134,7 @@ index e476611..e8b72d3 100644 (unsigned char*)string_get(decrypted)+string_length(decrypted), &decryptdone)) { /* TODO: need cleaner way: */ -@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *cipher retval = true; bail_out: diff --git a/net/chaosvpn/patches/010-openssl-deprecated.patch b/net/chaosvpn/patches/010-openssl-deprecated.patch index 4690f92cfe..5d1ebf444d 100644 --- a/net/chaosvpn/patches/010-openssl-deprecated.patch +++ b/net/chaosvpn/patches/010-openssl-deprecated.patch @@ -32,7 +32,7 @@ } void -@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void) +@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void * OpenSSL library used. * Output a warning if not. */ diff --git a/net/conserver/patches/001-remove-strip.patch b/net/conserver/patches/001-remove-strip.patch index 9271c5102c..2befd20d3e 100644 --- a/net/conserver/patches/001-remove-strip.patch +++ b/net/conserver/patches/001-remove-strip.patch @@ -1,7 +1,6 @@ -diff -ur conserver-8.2.1.old/autologin/Makefile.in conserver-8.2.1/autologin/Makefile.in ---- conserver-8.2.1.old/autologin/Makefile.in 2013-09-14 00:46:49.000000000 +0200 -+++ conserver-8.2.1/autologin/Makefile.in 2016-03-30 17:11:44.489446435 +0200 -@@ -9,7 +9,7 @@ +--- a/autologin/Makefile.in ++++ b/autologin/Makefile.in +@@ -9,7 +9,7 @@ sysconfdir = @sysconfdir@ ### Installation programs and flags INSTALL = @INSTALL@ @@ -10,10 +9,9 @@ diff -ur conserver-8.2.1.old/autologin/Makefile.in conserver-8.2.1/autologin/Mak LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/conserver/Makefile.in conserver-8.2.1/conserver/Makefile.in ---- conserver-8.2.1.old/conserver/Makefile.in 2013-09-14 00:46:53.000000000 +0200 -+++ conserver-8.2.1/conserver/Makefile.in 2016-03-30 17:11:44.509446803 +0200 -@@ -14,7 +14,7 @@ +--- a/conserver/Makefile.in ++++ b/conserver/Makefile.in +@@ -14,7 +14,7 @@ exampledir = $(datadir)/examples/conserv ### Installation programs and flags INSTALL = @INSTALL@ @@ -22,10 +20,9 @@ diff -ur conserver-8.2.1.old/conserver/Makefile.in conserver-8.2.1/conserver/Mak LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/console/Makefile.in conserver-8.2.1/console/Makefile.in ---- conserver-8.2.1.old/console/Makefile.in 2013-09-14 00:46:55.000000000 +0200 -+++ conserver-8.2.1/console/Makefile.in 2016-03-30 17:11:44.481446288 +0200 -@@ -10,7 +10,7 @@ +--- a/console/Makefile.in ++++ b/console/Makefile.in +@@ -10,7 +10,7 @@ mandir = @mandir@ ### Installation programs and flags INSTALL = @INSTALL@ @@ -34,10 +31,9 @@ diff -ur conserver-8.2.1.old/console/Makefile.in conserver-8.2.1/console/Makefil LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/contrib/chat/Makefile.in conserver-8.2.1/contrib/chat/Makefile.in ---- conserver-8.2.1.old/contrib/chat/Makefile.in 2013-09-14 00:47:31.000000000 +0200 -+++ conserver-8.2.1/contrib/chat/Makefile.in 2016-03-30 17:11:44.501446656 +0200 -@@ -10,7 +10,7 @@ +--- a/contrib/chat/Makefile.in ++++ b/contrib/chat/Makefile.in +@@ -10,7 +10,7 @@ mandir = @mandir@ ### Installation programs and flags INSTALL = @INSTALL@ diff --git a/net/coova-chilli/patches/200-wolfssl.patch b/net/coova-chilli/patches/200-wolfssl.patch index 9cc61da9c2..dac526dae0 100644 --- a/net/coova-chilli/patches/200-wolfssl.patch +++ b/net/coova-chilli/patches/200-wolfssl.patch @@ -11,7 +11,7 @@ [Define if you have cyassl]) --- a/src/ippool.c +++ b/src/ippool.c -@@ -35,6 +35,7 @@ int ippool_print(int fd, struct ippool_t *this) { +@@ -35,6 +35,7 @@ int ippool_print(int fd, struct ippool_t char * sep = "-- %-15s ------------------------------------------------------------\n"; #define ERR 0 @@ -31,7 +31,7 @@ struct MD5Context { --- a/src/ssl.c +++ b/src/ssl.c -@@ -131,7 +131,7 @@ _openssl_env_init(openssl_env *env, char *engine, int server) { +@@ -131,7 +131,7 @@ _openssl_env_init(openssl_env *env, char */ const long options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; env->meth = SSLv23_method(); diff --git a/net/coova-chilli/patches/300-sysinfo.patch b/net/coova-chilli/patches/300-sysinfo.patch index 033b5ef940..3881d2a742 100644 --- a/net/coova-chilli/patches/300-sysinfo.patch +++ b/net/coova-chilli/patches/300-sysinfo.patch @@ -11,8 +11,6 @@ Signed-off-by: Rosen Penev src/system.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/system.h b/src/system.h -index 257b65b..5c1aa4a 100644 --- a/src/system.h +++ b/src/system.h @@ -114,6 +114,7 @@ diff --git a/net/darkstat/patches/101-allow-multiple-local-interfaces.patch b/net/darkstat/patches/101-allow-multiple-local-interfaces.patch index b2b22faa55..7f2e00f875 100644 --- a/net/darkstat/patches/101-allow-multiple-local-interfaces.patch +++ b/net/darkstat/patches/101-allow-multiple-local-interfaces.patch @@ -37,7 +37,7 @@ } verbosef("local network address: %s", addr_to_str(&localnet)); -@@ -138,11 +145,15 @@ static int addr_is_local(const struct addr * const a, +@@ -138,11 +145,15 @@ static int addr_is_local(const struct ad if (is_localip(a, local_ips)) return 1; if (a->family == IPv4 && using_localnet4) { @@ -59,7 +59,7 @@ } --- a/darkstat.c +++ b/darkstat.c -@@ -193,7 +193,7 @@ static struct cmdline_arg cmdline_args[] = { +@@ -193,7 +193,7 @@ static struct cmdline_arg cmdline_args[] {"-r", "capfile", cb_capfile, 0}, {"-p", "port", cb_port, 0}, {"-b", "bindaddr", cb_bindaddr, -1}, diff --git a/net/davfs2/patches/010-main_code_fix.patch b/net/davfs2/patches/010-main_code_fix.patch index 99b588f8f5..a20430fbea 100644 --- a/net/davfs2/patches/010-main_code_fix.patch +++ b/net/davfs2/patches/010-main_code_fix.patch @@ -1,6 +1,6 @@ --- a/src/webdav.c +++ b/src/webdav.c -@@ -2037,7 +2037,7 @@ ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert) +@@ -2045,7 +2045,7 @@ ssl_verify(void *userdata, int failures, len = getline(&s, &n, stdin); if (len < 0) abort(); diff --git a/net/davfs2/patches/030-realpath.patch b/net/davfs2/patches/030-realpath.patch index a1658e27a4..27a5588f5b 100644 --- a/net/davfs2/patches/030-realpath.patch +++ b/net/davfs2/patches/030-realpath.patch @@ -1,6 +1,6 @@ --- a/src/mount_davfs.c +++ b/src/mount_davfs.c -@@ -702,7 +702,7 @@ check_fstab(const dav_args *args) +@@ -672,7 +672,7 @@ check_fstab(const dav_args *args) struct mntent *ft = getmntent(fstab); while (ft) { if (ft->mnt_dir) { @@ -9,7 +9,7 @@ if (mp) { if (strcmp(mp, mpoint) == 0) { free(mp); -@@ -966,7 +966,7 @@ parse_commandline(int argc, char *argv[]) +@@ -911,7 +911,7 @@ parse_commandline(int argc, char *argv[] url = ne_strdup(argv[i]); } i++; @@ -18,7 +18,7 @@ if (!mpoint) error(EXIT_FAILURE, 0, _("can't evaluate path of mount point %s"), mpoint); -@@ -2188,7 +2188,7 @@ read_config(dav_args *args, const char * filename, int system) +@@ -2131,7 +2131,7 @@ read_config(dav_args *args, const char * error_at_line(EXIT_FAILURE, 0, filename, lineno, _("malformed line")); *(parmv[0] + strlen(parmv[0]) - 1) = '\0'; @@ -27,7 +27,7 @@ if (mp) { applies = (strcmp(mp, mpoint) == 0); free(mp); -@@ -2440,7 +2440,7 @@ read_secrets(dav_args *args, const char *filename) +@@ -2386,7 +2386,7 @@ read_secrets(dav_args *args, const char if (scheme && !port) port = ne_uri_defaultport(scheme); diff --git a/net/davfs2/patches/050-sys-types.patch b/net/davfs2/patches/050-sys-types.patch index 9478b8b780..0e82c74901 100644 --- a/net/davfs2/patches/050-sys-types.patch +++ b/net/davfs2/patches/050-sys-types.patch @@ -1,6 +1,6 @@ --- a/src/kernel_interface.c +++ b/src/kernel_interface.c -@@ -45,6 +45,8 @@ +@@ -46,6 +46,8 @@ #include #endif diff --git a/net/dcwapd/patches/01_add_uci_config_provider.patch b/net/dcwapd/patches/01_add_uci_config_provider.patch index afb034bdd8..de6eec91bd 100644 --- a/net/dcwapd/patches/01_add_uci_config_provider.patch +++ b/net/dcwapd/patches/01_add_uci_config_provider.patch @@ -1,4 +1,4 @@ ---- a/dev/null +--- /dev/null +++ b/dcwlinux/uci_configuration_provider.h @@ -0,0 +1,104 @@ +#ifndef UCI_CONFIGURATION_PROVIDER_H_INCLUDED @@ -105,7 +105,7 @@ +}; //namespace dcwlinux { + +#endif //#ifndef UCI_CONFIGURATION_PROVIDER_H_INCLUDED ---- a/dev/null +--- /dev/null +++ b/dcwlinux/uci_configuration_provider.cxx @@ -0,0 +1,365 @@ + diff --git a/net/dnscrypt-proxy/patches/010-internal.patch b/net/dnscrypt-proxy/patches/010-internal.patch index f10a85f1ba..18b27ab4b7 100644 --- a/net/dnscrypt-proxy/patches/010-internal.patch +++ b/net/dnscrypt-proxy/patches/010-internal.patch @@ -1,6 +1,6 @@ --- a/src/proxy/app.c +++ b/src/proxy/app.c -@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv[]) +@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv } logger_noformat(&proxy_context, LOG_NOTICE, "Starting " PACKAGE_STRING); sodium_mlock(&proxy_context, sizeof proxy_context); diff --git a/net/eoip/patches/100-add_LF_to_pidfile.patch b/net/eoip/patches/100-add_LF_to_pidfile.patch index bb66d146d4..66278d4651 100644 --- a/net/eoip/patches/100-add_LF_to_pidfile.patch +++ b/net/eoip/patches/100-add_LF_to_pidfile.patch @@ -1,6 +1,6 @@ ---- a/eoip.c 2013-09-25 22:50:48.272763057 +0200 -+++ b/eoip.c 2013-09-25 22:51:03.804762840 +0200 -@@ -430,7 +430,7 @@ +--- a/eoip.c ++++ b/eoip.c +@@ -430,7 +430,7 @@ int main(int argc, char **argv) exit(1); mfd = fopen(pidfile, "w"); diff --git a/net/etherwake/patches/110-format_security_fix.patch b/net/etherwake/patches/110-format_security_fix.patch index e937fb3419..165d2ce2cd 100644 --- a/net/etherwake/patches/110-format_security_fix.patch +++ b/net/etherwake/patches/110-format_security_fix.patch @@ -1,6 +1,6 @@ --- a/ether-wake.c +++ b/ether-wake.c -@@ -135,7 +135,7 @@ int main(int argc, char *argv[]) +@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) case 'D': debug++; break; case 'i': ifname = optarg; break; case 'p': get_wol_pw(optarg); break; @@ -9,7 +9,7 @@ case 'v': verbose++; break; case 'V': do_version++; break; case '?': -@@ -144,7 +144,7 @@ int main(int argc, char *argv[]) +@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) if (verbose || do_version) printf("%s\n", version_msg); if (errflag) { @@ -17,3 +17,4 @@ + fprintf(stderr, "%s\n", brief_usage_msg); return 3; } + diff --git a/net/etherwake/patches/120-musl-compat.patch b/net/etherwake/patches/120-musl-compat.patch index a2cdfba9d6..e55f572485 100644 --- a/net/etherwake/patches/120-musl-compat.patch +++ b/net/etherwake/patches/120-musl-compat.patch @@ -1,6 +1,6 @@ --- a/ether-wake.c +++ b/ether-wake.c -@@ -82,14 +82,8 @@ static char usage_msg[] = +@@ -78,14 +78,8 @@ static char usage_msg[] = #include #include diff --git a/net/foolsm/patches/100-plugin-export-dir.patch b/net/foolsm/patches/100-plugin-export-dir.patch index 028413f89d..79c3bcd8ec 100644 --- a/net/foolsm/patches/100-plugin-export-dir.patch +++ b/net/foolsm/patches/100-plugin-export-dir.patch @@ -1,6 +1,6 @@ ---- a/defs.h 2016-11-10 07:22:50.275506874 -0500 -+++ b/defs.h 2016-11-10 07:22:58.639469850 -0500 -@@ -22,7 +22,7 @@ +--- a/defs.h ++++ b/defs.h +@@ -22,7 +22,7 @@ License: GPLv2 #define min(x, y) ((x)<(y) ? (x) : (y)) diff --git a/net/foolsm/patches/110-missing-WAIT_ANY.patch b/net/foolsm/patches/110-missing-WAIT_ANY.patch index 4409a8c42c..673baa87e1 100644 --- a/net/foolsm/patches/110-missing-WAIT_ANY.patch +++ b/net/foolsm/patches/110-missing-WAIT_ANY.patch @@ -1,6 +1,6 @@ ---- a/forkexec.c 2017-11-02 07:45:28.679821530 -0400 -+++ /bforkexec.c 2017-11-02 07:44:54.527653043 -0400 -@@ -108,7 +108,7 @@ +--- a/forkexec.c ++++ b/forkexec.c +@@ -108,7 +108,7 @@ static void sigchld_hdl(int sig) int script_status; pid_t pid; diff --git a/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch b/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch index 559119ddc5..73561f50f3 100644 --- a/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch +++ b/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch @@ -9,7 +9,7 @@ Last-Update: 2020-04-28 --- a/src/main/tls.c +++ b/src/main/tls.c -@@ -675,7 +675,7 @@ tls_session_t *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQU +@@ -675,7 +675,7 @@ tls_session_t *tls_new_session(TALLOC_CT state->mtu = vp->vp_integer; } @@ -36,7 +36,7 @@ Last-Update: 2020-04-28 /* * Create a unique context Id per EAP-TLS configuration. */ -@@ -3571,7 +3571,7 @@ fr_tls_server_conf_t *tls_server_conf_parse(CONF_SECTION *cs) +@@ -3571,7 +3571,7 @@ fr_tls_server_conf_t *tls_server_conf_pa goto error; } diff --git a/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch b/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch index c3f368e24f..e2cdfb9f75 100644 --- a/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch +++ b/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch @@ -9,4 +9,3 @@ fi ( - diff --git a/net/freeradius3/patches/010-openssl-deprecated.patch b/net/freeradius3/patches/010-openssl-deprecated.patch index 203b71378b..aeaf4928e6 100644 --- a/net/freeradius3/patches/010-openssl-deprecated.patch +++ b/net/freeradius3/patches/010-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/src/main/threads.c +++ b/src/main/threads.c -@@ -298,6 +298,7 @@ static void ssl_locking_function(int mode, int n, UNUSED char const *file, UNUSE +@@ -298,6 +298,7 @@ static void ssl_locking_function(int mod */ int tls_mutexes_init(void) { @@ -18,7 +18,7 @@ } --- a/src/main/tls.c +++ b/src/main/tls.c -@@ -55,6 +55,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ +@@ -55,6 +55,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API # include # endif # include @@ -26,7 +26,7 @@ #define LOG_PREFIX "tls" -@@ -2133,7 +2134,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2133,7 +2134,7 @@ int cbtls_verify(int ok, X509_STORE_CTX int my_ok = ok; ASN1_INTEGER *sn = NULL; @@ -35,7 +35,7 @@ VALUE_PAIR **certs; char **identity; #ifdef HAVE_OPENSSL_OCSP_H -@@ -2207,7 +2208,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2207,7 +2208,7 @@ int cbtls_verify(int ok, X509_STORE_CTX * Get the Expiration Date */ buf[0] = '\0'; @@ -44,7 +44,7 @@ if (certs && (lookup <= 1) && asn_time && (asn_time->length < (int) sizeof(buf))) { memcpy(buf, (char*) asn_time->data, asn_time->length); -@@ -2220,7 +2221,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2220,7 +2221,7 @@ int cbtls_verify(int ok, X509_STORE_CTX * Get the Valid Since Date */ buf[0] = '\0'; @@ -53,7 +53,7 @@ if (certs && (lookup <= 1) && asn_time && (asn_time->length < (int) sizeof(buf))) { memcpy(buf, (char*) asn_time->data, asn_time->length); -@@ -2690,10 +2691,12 @@ static int set_ecdh_curve(SSL_CTX *ctx, char const *ecdh_curve, bool disable_sin +@@ -2690,10 +2691,12 @@ static int set_ecdh_curve(SSL_CTX *ctx, */ int tls_global_init(bool spawn_flag, bool check) { @@ -66,7 +66,7 @@ /* * Initialize the index for the certificates. -@@ -2769,6 +2772,7 @@ int tls_global_version_check(char const *acknowledged) +@@ -2769,6 +2772,7 @@ int tls_global_version_check(char const */ void tls_global_cleanup(void) { diff --git a/net/frr/patches/098-fix_mips_libyang.patch b/net/frr/patches/098-fix_mips_libyang.patch index 3785cfef3e..adf0785b5e 100644 --- a/net/frr/patches/098-fix_mips_libyang.patch +++ b/net/frr/patches/098-fix_mips_libyang.patch @@ -1,6 +1,6 @@ --- a/lib/northbound.h +++ b/lib/northbound.h -@@ -504,11 +504,7 @@ struct frr_yang_module_info { +@@ -562,11 +562,7 @@ struct frr_yang_module_info { /* Priority - lower priorities are processed first. */ uint32_t priority; diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch index bb7a61d132..3fa826b6b1 100644 --- a/net/git/patches/100-configure_for_crosscompiling.patch +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -952,7 +952,8 @@ AC_RUN_IFELSE( +@@ -1001,7 +1001,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); return f != NULL;]])], [ac_cv_fread_reads_directories=no], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -986,7 +987,8 @@ AC_RUN_IFELSE( +@@ -1035,7 +1036,8 @@ AC_RUN_IFELSE( if (snprintf(buf, 3, "%s", "12345") != 5 || strcmp(buf, "12")) return 1]])], [ac_cv_snprintf_returns_bogus=no], @@ -20,7 +20,7 @@ ]) if test $ac_cv_snprintf_returns_bogus = yes; then SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes -@@ -1009,7 +1011,8 @@ yippeeyeswehaveit +@@ -1058,7 +1060,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index e383011368..5de4e93309 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1378,7 +1378,7 @@ endif +@@ -1428,7 +1428,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/git/patches/310-fix-uname-detection-for-crosscompiling b/net/git/patches/310-fix-uname-detection-for-crosscompiling index 3831958c3c..0402a8f415 100644 --- a/net/git/patches/310-fix-uname-detection-for-crosscompiling +++ b/net/git/patches/310-fix-uname-detection-for-crosscompiling @@ -20,12 +20,11 @@ Signed-off-by: Mauro Condarelli config.mak.uname | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/config.mak.uname b/config.mak.uname -index 40d6b29..d933b23 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -1,11 +1,11 @@ - # Platform specific Makefile tweaks based on uname detection +@@ -4,12 +4,12 @@ + # Microsoft's Safe Exception Handling in libraries (such as zlib). + # Typically required for VS2013+/32-bit compilation on Vista+ versions. -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') @@ -41,4 +40,4 @@ index 40d6b29..d933b23 100644 +uname_V ?= $(shell sh -c 'uname -v 2>/dev/null || echo not') ifdef MSVC - # avoid the MingW and Cygwin configuration sections + # avoid the MingW and Cygwin configuration sections diff --git a/net/gitolite/patches/0100-avoid-ssh-keygen.patch b/net/gitolite/patches/0100-avoid-ssh-keygen.patch index f74e517851..253e0f9f01 100644 --- a/net/gitolite/patches/0100-avoid-ssh-keygen.patch +++ b/net/gitolite/patches/0100-avoid-ssh-keygen.patch @@ -11,10 +11,8 @@ gitolite: Eliminate the need for ssh-keygen dependency embedded distro such as OpenWrt. Signed-off-by: Daniel F. Dickinson -Index: gitolite-3.6.11/src/lib/Gitolite/Common.pm -=================================================================== ---- gitolite-3.6.11.orig/src/lib/Gitolite/Common.pm -+++ gitolite-3.6.11/src/lib/Gitolite/Common.pm +--- a/src/lib/Gitolite/Common.pm ++++ b/src/lib/Gitolite/Common.pm @@ -26,6 +26,8 @@ package Gitolite::Common; use Exporter 'import'; use File::Path qw(mkpath); @@ -24,7 +22,7 @@ Index: gitolite-3.6.11/src/lib/Gitolite/Common.pm use Carp qw(carp cluck croak confess); use strict; -@@ -352,43 +352,82 @@ sub logger_plus_stderr { +@@ -352,43 +354,82 @@ sub logger_plus_stderr { } # ---------------------------------------------------------------------- diff --git a/net/horst/patches/0001-reproducible-builds.patch b/net/horst/patches/0001-reproducible-builds.patch index 541d16f745..cde876d1bc 100644 --- a/net/horst/patches/0001-reproducible-builds.patch +++ b/net/horst/patches/0001-reproducible-builds.patch @@ -1,7 +1,5 @@ -Index: horst-5.1/conf_options.c -=================================================================== ---- horst-5.1.orig/conf_options.c -+++ horst-5.1/conf_options.c +--- a/conf_options.c ++++ b/conf_options.c @@ -519,7 +519,7 @@ void config_parse_file_and_cmdline(int a conf_filename = optarg; break; @@ -11,10 +9,8 @@ Index: horst-5.1/conf_options.c exit(0); case 'h': case '?': -Index: horst-5.1/display-help.c -=================================================================== ---- horst-5.1.orig/display-help.c -+++ horst-5.1/display-help.c +--- a/display-help.c ++++ b/display-help.c @@ -36,7 +36,7 @@ void update_help_win(WINDOW *win) print_centered(win, 2, COLS, "HORST - Horsts OLSR Radio Scanning Tool (or)"); print_centered(win, 3, COLS, "HORST - Highly Optimized Radio Scanning Tool"); diff --git a/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch b/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch index fd07db5f05..9ef603928c 100644 --- a/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch +++ b/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch @@ -15,8 +15,6 @@ Signed-off-by: Eneas U de Queiroz create mode 100644 ibrdtn/daemon/src/security/exchange/openssl_compat.cpp create mode 100644 ibrdtn/daemon/src/security/exchange/openssl_compat.h -diff --git a/src/security/exchange/DHProtocol.cpp b/src/security/exchange/DHProtocol.cpp -index e94c5026..3e0ad717 100644 --- a/src/security/exchange/DHProtocol.cpp +++ b/src/security/exchange/DHProtocol.cpp @@ -30,6 +30,7 @@ @@ -97,8 +95,6 @@ index e94c5026..3e0ad717 100644 manager.submit(session, response); -diff --git a/src/security/exchange/Makefile.am b/src/security/exchange/Makefile.am -index a6b2f832..71ed8365 100644 --- a/src/security/exchange/Makefile.am +++ b/src/security/exchange/Makefile.am @@ -22,6 +22,8 @@ exchange_SOURCES += \ @@ -110,9 +106,6 @@ index a6b2f832..71ed8365 100644 QRCodeProtocol.h \ QRCodeProtocol.cpp -diff --git a/src/security/exchange/openssl_compat.cpp b/src/security/exchange/openssl_compat.cpp -new file mode 100644 -index 00000000..e3baba0f --- /dev/null +++ b/src/security/exchange/openssl_compat.cpp @@ -0,0 +1,62 @@ @@ -178,9 +171,6 @@ index 00000000..e3baba0f +} + +#endif /* OPENSSL_VERSION_NUMBER */ -diff --git a/src/security/exchange/openssl_compat.h b/src/security/exchange/openssl_compat.h -new file mode 100644 -index 00000000..29e7d415 --- /dev/null +++ b/src/security/exchange/openssl_compat.h @@ -0,0 +1,13 @@ @@ -197,6 +187,3 @@ index 00000000..29e7d415 + +#endif /* OPENSSL_VERSION_NUMBER */ +#endif /* LIBCRYPTO_COMPAT_H */ --- -2.16.1 - diff --git a/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch b/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch index b006ff843c..1f0a239b4d 100644 --- a/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch +++ b/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch @@ -22,11 +22,9 @@ Signed-off-by: Matthieu Baerts ifstat.h | 6 +-- snmp.c | 12 +++--- -diff --git a/data.c b/data.c -index e29149b..9af27bf 100644 --- a/data.c +++ b/data.c -@@ -103,8 +103,8 @@ void ifstat_free_interface(struct ifstat_data *data) { +@@ -103,8 +103,8 @@ void ifstat_free_interface(struct ifstat } void ifstat_set_interface_stats(struct ifstat_data *data, @@ -37,8 +35,6 @@ index e29149b..9af27bf 100644 if (data->bout > bytesout || data->bin > bytesin) { if (!ifstat_quiet) ifstat_error("warning: rollover for interface %s, reinitialising.", data->name); -diff --git a/drivers.c b/drivers.c -index d5ac501..2861fff 100644 --- a/drivers.c +++ b/drivers.c @@ -140,6 +140,7 @@ char *strchr (), *strrchr (); @@ -49,7 +45,7 @@ index d5ac501..2861fff 100644 #ifdef IFF_LOOPBACK if ((ifflags & IFF_LOOPBACK) && !(ifs->flags & IFSTAT_LOOPBACK)) return; -@@ -242,6 +243,7 @@ static int ioctl_map_scan(int sd, struct ifreq *ifr, void *data) { +@@ -242,6 +243,7 @@ static int ioctl_map_scan(int sd, struct static int ioctl_scan_interfaces(struct ifstat_driver *driver, struct ifstat_list *ifs) { int sd; @@ -57,7 +53,7 @@ index d5ac501..2861fff 100644 if ((sd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ifstat_perror("socket"); -@@ -256,7 +258,7 @@ static int ioctl_scan_interfaces(struct ifstat_driver *driver, +@@ -256,7 +258,7 @@ static int ioctl_scan_interfaces(struct #endif #ifdef USE_KSTAT @@ -66,7 +62,7 @@ index d5ac501..2861fff 100644 kstat_named_t *data; if ((data = kstat_data_lookup(ksp, name)) == NULL) -@@ -277,7 +279,7 @@ static int get_kstat_long(kstat_t *ksp, char *name, unsigned long *value) { +@@ -277,7 +279,7 @@ static int get_kstat_long(kstat_t *ksp, *value = data->value.ui64; break; #else @@ -75,7 +71,7 @@ index d5ac501..2861fff 100644 *value = data->value.ll; break; case KSTAT_DATA_ULONGLONG: -@@ -311,7 +313,7 @@ static int kstat_open_driver(struct ifstat_driver *driver, +@@ -311,7 +313,7 @@ static int kstat_open_driver(struct ifst static int kstat_get_stats(struct ifstat_driver *driver, struct ifstat_list *ifs) { @@ -84,7 +80,7 @@ index d5ac501..2861fff 100644 struct ifstat_data *cur; kstat_ctl_t *kc = driver->data; kstat_t *ksp; -@@ -802,7 +804,7 @@ static int proc_get_stats(struct ifstat_driver *driver, +@@ -802,7 +804,7 @@ static int proc_get_stats(struct ifstat_ char buf[1024]; FILE *f; char *iface, *stats; @@ -93,7 +89,7 @@ index d5ac501..2861fff 100644 struct ifstat_data *cur; struct proc_driver_data *data = driver->data; char *file; -@@ -839,7 +841,7 @@ static int proc_get_stats(struct ifstat_driver *driver, +@@ -839,7 +841,7 @@ static int proc_get_stats(struct ifstat_ iface++; if (*iface == '\0') continue; @@ -102,7 +98,7 @@ index d5ac501..2861fff 100644 continue; if ((cur = ifstat_get_interface(ifs, iface)) != NULL) -@@ -1326,9 +1328,9 @@ static int win32_get_stats(struct ifstat_driver *driver, +@@ -1326,9 +1328,9 @@ static int win32_get_stats(struct ifstat for (i = 0; i < iftable->dwNumEntries; i++) { if ((cur = ifstat_get_interface(ifs, iftable->table[i].bDescr)) != NULL) ifstat_set_interface_stats(cur, @@ -114,7 +110,7 @@ index d5ac501..2861fff 100644 iftable->table[i].dwOutOctets); } return 1; -@@ -1346,40 +1348,40 @@ void win32_close_driver(struct ifstat_driver *driver) { +@@ -1346,40 +1348,40 @@ void win32_close_driver(struct ifstat_dr static struct ifstat_driver drivers[] = { #ifdef USE_KSTAT { "kstat", &kstat_open_driver, &ioctl_scan_interfaces, &kstat_get_stats, @@ -165,11 +161,9 @@ index d5ac501..2861fff 100644 int ifstat_get_driver(char *name, struct ifstat_driver *driver) { int num = 0; -diff --git a/ifstat.c b/ifstat.c -index 942aa94..0521e71 100644 --- a/ifstat.c +++ b/ifstat.c -@@ -215,7 +215,8 @@ static RETSIGTYPE update_termsize(int sig) { +@@ -215,7 +215,8 @@ static RETSIGTYPE update_termsize(int si int _sigcont = 0; #ifdef SIGCONT static RETSIGTYPE sigcont(int sig) { @@ -188,8 +182,6 @@ index 942aa94..0521e71 100644 #define LEN(options, namelen) (((options) & OPT_FIXEDWIDTH || (namelen) < WIDTH) ? WIDTH : (namelen)) #define FMT(n) (((n) < 1e+5) ? "%8.2f" : (((n) < 1e+6) ? "%.1f" : "%.2e")) -diff --git a/ifstat.h b/ifstat.h -index b63a3fb..dff38b6 100644 --- a/ifstat.h +++ b/ifstat.h @@ -35,7 +35,7 @@ @@ -201,7 +193,7 @@ index b63a3fb..dff38b6 100644 int flags, index; struct ifstat_data *next; }; -@@ -72,8 +72,8 @@ void ifstat_add_interface(struct ifstat_list *ifs, char *ifname, int flags); +@@ -72,8 +72,8 @@ void ifstat_add_interface(struct ifstat_ void ifstat_free_interface(struct ifstat_data *data); void ifstat_set_interface_stats(struct ifstat_data *data, @@ -212,11 +204,9 @@ index b63a3fb..dff38b6 100644 void ifstat_set_interface_index(struct ifstat_data *data, int index); -diff --git a/snmp.c b/snmp.c -index 2457001..5dd8a0a 100644 --- a/snmp.c +++ b/snmp.c -@@ -91,7 +91,7 @@ static int snmp_get_ifcount(struct snmp_session *ss) { +@@ -91,7 +91,7 @@ static int snmp_get_ifcount(struct snmp_ static int snmp_get_nextif(struct snmp_session *ss, int index) { oid ifindex[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 1, 0 }; @@ -225,7 +215,7 @@ index 2457001..5dd8a0a 100644 struct snmp_pdu *pdu; struct snmp_pdu *response = NULL; struct variable_list *vars; -@@ -139,7 +139,7 @@ static int snmp_get_nextif(struct snmp_session *ss, int index) { +@@ -139,7 +139,7 @@ static int snmp_get_nextif(struct snmp_s struct ifsnmp { char name[S_IFNAMEMAX]; @@ -234,7 +224,7 @@ index 2457001..5dd8a0a 100644 int flags, index; }; -@@ -248,7 +248,7 @@ static int snmp_get_ifinfos(struct snmp_session *ss, int nifaces, +@@ -248,7 +248,7 @@ static int snmp_get_ifinfos(struct snmp_ if (memcmp(ifinfo, vars->name, sizeof(ifinfo) - 2 * sizeof(oid)) != 0) continue; for(i = 0; i < nifaces; i++) { @@ -243,7 +233,7 @@ index 2457001..5dd8a0a 100644 break; } -@@ -258,11 +258,11 @@ static int snmp_get_ifinfos(struct snmp_session *ss, int nifaces, +@@ -258,11 +258,11 @@ static int snmp_get_ifinfos(struct snmp_ switch (vars->name[9]) { case ifDescr: if (vars->type == ASN_OCTET_STR) { @@ -257,7 +247,7 @@ index 2457001..5dd8a0a 100644 ifsnmp[i].name[count] = '\0'; } break; -@@ -361,7 +361,7 @@ int snmp_open_driver(struct ifstat_driver *driver, char *options) { +@@ -361,7 +361,7 @@ int snmp_open_driver(struct ifstat_drive snmp_sess_init(&session); session.peername = host; session.version = SNMP_VERSION_1; diff --git a/net/iftop/patches/010-gcc10.patch b/net/iftop/patches/010-gcc10.patch index 7c212d03a8..ffa81cf5e2 100644 --- a/net/iftop/patches/010-gcc10.patch +++ b/net/iftop/patches/010-gcc10.patch @@ -16,8 +16,6 @@ Signed-off-by: Fabrice Fontaine ui_common.h | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) -diff --git a/ui_common.c b/ui_common.c -index dcf6646..b1027ec 100644 --- a/ui_common.c +++ b/ui_common.c @@ -17,6 +17,12 @@ @@ -33,8 +31,6 @@ index dcf6646..b1027ec 100644 /* 2, 10 and 40 seconds */ int history_divs[HISTORY_DIVISIONS] = {1, 5, 20}; -diff --git a/ui_common.h b/ui_common.h -index 63ae5bb..add72fe 100644 --- a/ui_common.h +++ b/ui_common.h @@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { diff --git a/net/iodine/patches/010-cross-compile.patch b/net/iodine/patches/010-cross-compile.patch index 40dfb0a706..8226a69a08 100644 --- a/net/iodine/patches/010-cross-compile.patch +++ b/net/iodine/patches/010-cross-compile.patch @@ -1,5 +1,5 @@ ---- iodine-0.7.0.orig/src/osflags -+++ iodine-0.7.0/src/osflags +--- a/src/osflags ++++ b/src/osflags @@ -16,12 +16,6 @@ link) windows32) echo '-lws2_32 -liphlpapi'; diff --git a/net/iodine/patches/100-musl-compatibility.patch b/net/iodine/patches/100-musl-compatibility.patch index ef55c3c52c..bb09627d40 100644 --- a/net/iodine/patches/100-musl-compatibility.patch +++ b/net/iodine/patches/100-musl-compatibility.patch @@ -11,8 +11,6 @@ Date: Thu Jun 25 19:38:24 2015 +0300 The reason for such brutal intrusiuon is explained in musl FAQ: http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F -diff --git a/src/common.c b/src/common.c -index 2715979..5f0e370 100644 --- a/src/common.c +++ b/src/common.c @@ -57,7 +57,7 @@ diff --git a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch b/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch index ac3f309320..095c82c92c 100644 --- a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch +++ b/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch @@ -9,11 +9,9 @@ SSL_CTX_new is in both. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index e8290dfd..8dde6095 100644 --- a/configure.ac +++ b/configure.ac -@@ -319,7 +319,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [ +@@ -328,7 +328,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], CFLAGS="$CFLAGS $OPENSSL_CFLAGS" LIBS="$LIBS $OPENSSL_LIBS" ], [ @@ -22,6 +20,3 @@ index e8290dfd..8dde6095 100644 LIBS="$LIBS -lssl -lcrypto" ], [ AC_MSG_ERROR([The OpenSSL library was not found]) --- -2.17.1 - diff --git a/net/isc-dhcp/patches/520-bind-no-catgets.patch b/net/isc-dhcp/patches/520-bind-no-catgets.patch index 5655b08eba..ed8a4b063a 100644 --- a/net/isc-dhcp/patches/520-bind-no-catgets.patch +++ b/net/isc-dhcp/patches/520-bind-no-catgets.patch @@ -1,6 +1,6 @@ --- a/bind/Makefile.in +++ b/bind/Makefile.in -@@ -57,6 +57,7 @@ +@@ -57,6 +57,7 @@ bind1: rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ export CC=${CROSS_CC} && \ diff --git a/net/kismet/patches/030-libcxx.patch b/net/kismet/patches/030-libcxx.patch index 9f0a996647..5c1f63e05b 100644 --- a/net/kismet/patches/030-libcxx.patch +++ b/net/kismet/patches/030-libcxx.patch @@ -11,7 +11,7 @@ string(strerror(errno)), MSGFLAG_ERROR); --- a/packetsource_wext.cc +++ b/packetsource_wext.cc -@@ -405,7 +405,7 @@ void PacketSource_Wext::OpenWpaSupplicant() { +@@ -405,7 +405,7 @@ void PacketSource_Wext::OpenWpaSupplican wpa_local.sun_family = AF_UNIX; snprintf(wpa_local.sun_path, sizeof(wpa_local.sun_path), "%s", wpa_local_path.c_str()); @@ -22,7 +22,7 @@ MSGFLAG_PRINTERROR); --- a/tcpclient.cc +++ b/tcpclient.cc -@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_remotehost, short int in_port, +@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_re local_sock.sin_addr.s_addr = htonl(INADDR_ANY); local_sock.sin_port = htons(0); @@ -31,7 +31,7 @@ snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno)); globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR); close(cli_fd); -@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *in_remotehost, short int in_port, +@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *i local_sock.sin_addr.s_addr = htonl(INADDR_ANY); local_sock.sin_port = htons(0); diff --git a/net/knot/patches/01_zscanner_tests.patch b/net/knot/patches/01_zscanner_tests.patch index bd147ddc19..efcb122240 100644 --- a/net/knot/patches/01_zscanner_tests.patch +++ b/net/knot/patches/01_zscanner_tests.patch @@ -1,5 +1,3 @@ -diff --git a/tests/libzscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in -index 2c0c27526..72b2124c7 100644 --- a/tests/libzscanner/test_zscanner.in +++ b/tests/libzscanner/test_zscanner.in @@ -1,15 +1,14 @@ diff --git a/net/knot/patches/02_knot.conf.patch b/net/knot/patches/02_knot.conf.patch index 8c626690e5..f599e0dcfd 100644 --- a/net/knot/patches/02_knot.conf.patch +++ b/net/knot/patches/02_knot.conf.patch @@ -1,8 +1,6 @@ -diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in -index 10302f958..75082f537 100644 --- a/samples/knot.sample.conf.in +++ b/samples/knot.sample.conf.in -@@ -30,6 +30,8 @@ template: +@@ -33,6 +33,8 @@ template: - id: default storage: "@storage_dir@" file: "%s.zone" @@ -10,4 +8,4 @@ index 10302f958..75082f537 100644 + max-timer-db-size: 5M zone: - # # Master zone + # # Primary zone diff --git a/net/knxd/patches/0099-openwrt.patch b/net/knxd/patches/0099-openwrt.patch index 346a79b956..be77ffaf1d 100644 --- a/net/knxd/patches/0099-openwrt.patch +++ b/net/knxd/patches/0099-openwrt.patch @@ -1,6 +1,6 @@ ---- a/src/client/Makefile.am 2017-01-25 20:17:14.000000000 +0100 -+++ b/src/client/Makefile.am 2017-01-25 20:18:50.639995000 +0100 -@@ -4,5 +4,5 @@ +--- a/src/client/Makefile.am ++++ b/src/client/Makefile.am +@@ -4,5 +4,5 @@ else BUILDJAVA = endif diff --git a/net/knxd/patches/0100-version.patch b/net/knxd/patches/0100-version.patch index 9ff5a31135..d597753da8 100644 --- a/net/knxd/patches/0100-version.patch +++ b/net/knxd/patches/0100-version.patch @@ -1,8 +1,8 @@ ---- a/tools/version.sh 2020-04-08 19:39:40.349461034 +0200 -+++ b/tools/version.sh 2020-05-13 13:40:26.354277094 +0200 +--- a/tools/version.sh ++++ b/tools/version.sh @@ -1,4 +1,3 @@ #!/bin/sh - + -test -d .git || exit -git describe --tags +echo -n "0.14.39" diff --git a/net/knxd/patches/020-cdefs.patch b/net/knxd/patches/020-cdefs.patch index d2924e266e..a1bc124548 100644 --- a/net/knxd/patches/020-cdefs.patch +++ b/net/knxd/patches/020-cdefs.patch @@ -14,7 +14,7 @@ #include "eibloadresult.h" -@@ -935,5 +936,7 @@ int EIB_Cache_LastUpdates2_async (EIBConnection * con, uint32_t start, +@@ -935,5 +936,7 @@ int EIB_Cache_LastUpdates2_async (EIBCon uint32_t * end); diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch index 2ec16f852b..6d1e373dd6 100644 --- a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch +++ b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch @@ -1,6 +1,6 @@ --- a/src/kadmin/ktutil/ktutil_funcs.c +++ b/src/kadmin/ktutil/ktutil_funcs.c -@@ -64,7 +64,7 @@ krb5_error_code ktutil_delete(context, list, idx) +@@ -65,7 +65,7 @@ krb5_error_code ktutil_delete(context, l krb5_kt_list *list; int idx; { @@ -11,7 +11,7 @@ for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c -@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int req_neg, krb5_flags *toset, +@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int { int found = 0, invert = 0; size_t i; @@ -22,7 +22,7 @@ for (i = 0; !found && i < NFTBL; i++) { --- a/src/lib/krad/packet.c +++ b/src/lib/krad/packet.c -@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code, +@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx { krb5_error_code retval; krad_packet *pkt; @@ -33,7 +33,7 @@ pkt = packet_new(); --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -3764,7 +3764,7 @@ pkinit_open_session(krb5_context context, +@@ -3646,7 +3646,7 @@ pkinit_open_session(krb5_context context { CK_ULONG i, r; unsigned char *cp; @@ -44,7 +44,7 @@ CK_TOKEN_INFO tinfo; --- a/src/util/profile/prof_file.c +++ b/src/util/profile/prof_file.c -@@ -309,7 +309,7 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec) +@@ -270,7 +270,7 @@ errcode_t profile_update_file_data_locke unsigned long frac; time_t now; #endif @@ -52,4 +52,4 @@ + FILE *f = NULL; int isdir = 0; - #ifdef HAVE_STAT + if ((data->flags & PROFILE_FILE_NO_RELOAD) && data->root != NULL) diff --git a/net/libreswan/patches/010-nanosleep.patch b/net/libreswan/patches/010-nanosleep.patch index 45481cd1b4..c38b4dade8 100644 --- a/net/libreswan/patches/010-nanosleep.patch +++ b/net/libreswan/patches/010-nanosleep.patch @@ -9,13 +9,13 @@ #include #include "defs.h" -@@ -180,7 +180,8 @@ - /* Send a duplicate packet when this impair is enabled - used for testing */ - if (IMPAIR(JACOB_TWO_TWO)) { +@@ -192,7 +192,8 @@ static bool send_chunks(const char *wher + */ + if (impair.jacob_two_two) { /* sleep for half a second, and second another packet */ - usleep(500000); + const struct timespec req = {0, 500 * 1000 * 1000}; + nanosleep(&req, NULL); endpoint_buf b; endpoint_buf ib; - DBG_log("JACOB 2-2: resending %zu bytes for %s through %s from %s to %s:", + llog(RC_LOG, logger, diff --git a/net/libreswan/patches/020-limits.patch b/net/libreswan/patches/020-limits.patch index 5a5635698f..20d86cb80e 100644 --- a/net/libreswan/patches/020-limits.patch +++ b/net/libreswan/patches/020-limits.patch @@ -16,5 +16,5 @@ #include /* for gethostname() */ +#include - #include - #include "libreswan/pfkeyv2.h" + #include + #include diff --git a/net/libreswan/patches/030-fix_musl_build.patch b/net/libreswan/patches/030-fix_musl_build.patch index 7183a19899..1f0baad9e2 100644 --- a/net/libreswan/patches/030-fix_musl_build.patch +++ b/net/libreswan/patches/030-fix_musl_build.patch @@ -1,5 +1,5 @@ ---- a/include/fd.h 2020-10-25 12:29:43.527467613 +0200 -+++ b/include/fd.h 2020-10-25 12:27:41.043595114 +0200 +--- a/include/fd.h ++++ b/include/fd.h @@ -26,6 +26,7 @@ #include diff --git a/net/libreswan/patches/040-disable_man.patch b/net/libreswan/patches/040-disable_man.patch index 92850d5325..42a5c33644 100644 --- a/net/libreswan/patches/040-disable_man.patch +++ b/net/libreswan/patches/040-disable_man.patch @@ -1,6 +1,6 @@ ---- a/mk/targets.mk 2020-10-25 12:47:38.504784276 +0200 -+++ b/mk/targets.mk 2020-10-25 12:48:16.242123361 +0200 -@@ -64,7 +64,7 @@ +--- a/mk/targets.mk ++++ b/mk/targets.mk +@@ -64,7 +64,7 @@ endef # # For each define: TARGET clean-TARGET install-TARGET diff --git a/net/lighttpd/patches/010-meson-lua.patch b/net/lighttpd/patches/010-meson-lua.patch index d1c96c84af..e75250b884 100644 --- a/net/lighttpd/patches/010-meson-lua.patch +++ b/net/lighttpd/patches/010-meson-lua.patch @@ -12,11 +12,9 @@ Signed-off-by: Glenn Strauss src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/meson.build b/src/meson.build -index 71e4ec90..14ed9cec 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -381,7 +381,7 @@ endif +@@ -377,7 +377,7 @@ endif liblua = [] if get_option('with_lua') found_lua = false @@ -25,6 +23,3 @@ index 71e4ec90..14ed9cec 100644 if not(found_lua) liblua = dependency(l, required: false) if (liblua.found()) --- -2.28.0 - diff --git a/net/lighttpd/patches/020-meson-zstd.patch b/net/lighttpd/patches/020-meson-zstd.patch index deb7190a3c..184d6b19d6 100644 --- a/net/lighttpd/patches/020-meson-zstd.patch +++ b/net/lighttpd/patches/020-meson-zstd.patch @@ -8,8 +8,6 @@ Signed-off-by: Glenn Strauss meson_options.txt | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/meson_options.txt b/meson_options.txt -index 51bea44d..f6687159 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -148,6 +148,11 @@ option('with_zlib', @@ -24,6 +22,3 @@ index 51bea44d..f6687159 100644 option('build_extra_warnings', type: 'boolean', --- -2.29.2 - diff --git a/net/linknx/patches/010-cdefs.patch b/net/linknx/patches/010-cdefs.patch index 971a9c7405..aaa9f5ff85 100644 --- a/net/linknx/patches/010-cdefs.patch +++ b/net/linknx/patches/010-cdefs.patch @@ -15,7 +15,7 @@ #include "eibloadresult.h" -@@ -705,5 +706,7 @@ BCU_LOAD_RESULT EIB_LoadImage (EIBConnection * con, const uint8_t * image, +@@ -705,5 +706,7 @@ BCU_LOAD_RESULT EIB_LoadImage (EIBConnec */ int EIB_LoadImage_async (EIBConnection * con, const uint8_t * image, int len); diff --git a/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch b/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch index 3d9d939363..389138a814 100644 --- a/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch +++ b/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch @@ -19,8 +19,6 @@ Signed-off-by: Marcelo Ricardo Leitner src/include/netinet/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am -index ca0aac2..965db8c 100644 --- a/src/include/netinet/Makefile.am +++ b/src/include/netinet/Makefile.am @@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet @@ -30,6 +28,3 @@ index ca0aac2..965db8c 100644 -libcnetinet_HEADERS = sctp.h.in -BUILT_SOURCES = sctp.h +libcnetinet_HEADERS = sctp.h --- -2.17.1 - diff --git a/net/lora-gateway-hal/patches/0001-add-cmake-support.patch b/net/lora-gateway-hal/patches/0001-add-cmake-support.patch index e41e2ddcd5..8cf422baf8 100644 --- a/net/lora-gateway-hal/patches/0001-add-cmake-support.patch +++ b/net/lora-gateway-hal/patches/0001-add-cmake-support.patch @@ -29,9 +29,6 @@ Signed-off-by: Xue Liu create mode 100644 util_tx_continuous/CMakeLists.txt create mode 100644 util_tx_test/CMakeLists.txt -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..b112150 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,77 @@ @@ -112,16 +109,10 @@ index 0000000..b112150 + +# -- add util_tx_test +add_subdirectory(util_tx_test) -diff --git a/cmake/loragw-config.cmake b/cmake/loragw-config.cmake -new file mode 100644 -index 0000000..ee8687b --- /dev/null +++ b/cmake/loragw-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/loragw-targets.cmake") -diff --git a/libloragw/CMakeLists.txt b/libloragw/CMakeLists.txt -new file mode 100644 -index 0000000..b2102ae --- /dev/null +++ b/libloragw/CMakeLists.txt @@ -0,0 +1,150 @@ @@ -275,9 +266,6 @@ index 0000000..b2102ae + +endforeach() + -diff --git a/libloragw/loragw.pc.in b/libloragw/loragw.pc.in -new file mode 100644 -index 0000000..01bb3cf --- /dev/null +++ b/libloragw/loragw.pc.in @@ -0,0 +1,10 @@ @@ -291,9 +279,6 @@ index 0000000..01bb3cf +Version: @lora_gateway_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lloragw -diff --git a/libloragw/loragw_config.h.in b/libloragw/loragw_config.h.in -new file mode 100644 -index 0000000..76ad35a --- /dev/null +++ b/libloragw/loragw_config.h.in @@ -0,0 +1,14 @@ @@ -311,9 +296,6 @@ index 0000000..76ad35a +#cmakedefine01 DEBUG_LBT + +#endif -diff --git a/util_lbt_test/CMakeLists.txt b/util_lbt_test/CMakeLists.txt -new file mode 100644 -index 0000000..f184b82 --- /dev/null +++ b/util_lbt_test/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -340,9 +322,6 @@ index 0000000..f184b82 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_pkt_logger/CMakeLists.txt b/util_pkt_logger/CMakeLists.txt -new file mode 100644 -index 0000000..82cfc86 --- /dev/null +++ b/util_pkt_logger/CMakeLists.txt @@ -0,0 +1,29 @@ @@ -375,9 +354,6 @@ index 0000000..82cfc86 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_spectral_scan/CMakeLists.txt b/util_spectral_scan/CMakeLists.txt -new file mode 100644 -index 0000000..3cec2a9 --- /dev/null +++ b/util_spectral_scan/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -404,9 +380,6 @@ index 0000000..3cec2a9 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_spi_stress/CMakeLists.txt b/util_spi_stress/CMakeLists.txt -new file mode 100644 -index 0000000..d5f0eea --- /dev/null +++ b/util_spi_stress/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -433,9 +406,6 @@ index 0000000..d5f0eea + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_tx_continuous/CMakeLists.txt b/util_tx_continuous/CMakeLists.txt -new file mode 100644 -index 0000000..97c70e5 --- /dev/null +++ b/util_tx_continuous/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -462,9 +432,6 @@ index 0000000..97c70e5 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_tx_test/CMakeLists.txt b/util_tx_test/CMakeLists.txt -new file mode 100644 -index 0000000..6cc0e04 --- /dev/null +++ b/util_tx_test/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -491,6 +458,3 @@ index 0000000..6cc0e04 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) --- -2.20.1 - diff --git a/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch b/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch index 084a114a5e..17404b2263 100644 --- a/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch +++ b/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch @@ -8,8 +8,6 @@ Signed-off-by: Xue Liu libloragw/src/loragw_spi.native.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -diff --git a/libloragw/src/loragw_spi.native.c b/libloragw/src/loragw_spi.native.c -index c01ed1c..fe251e3 100644 --- a/libloragw/src/loragw_spi.native.c +++ b/libloragw/src/loragw_spi.native.c @@ -53,8 +53,15 @@ Maintainer: Sylvain Miermont @@ -30,6 +28,3 @@ index c01ed1c..fe251e3 100644 //#define SPI_DEV_PATH "/dev/spidev32766.0" /* -------------------------------------------------------------------------- */ --- -2.20.1 - diff --git a/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch b/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch index f80dde0fb6..fd82d02ca5 100644 --- a/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch +++ b/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch @@ -8,11 +8,9 @@ Signed-off-by: Xue Liu libloragw/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/libloragw/CMakeLists.txt b/libloragw/CMakeLists.txt -index b2102ae..32abf51 100644 --- a/libloragw/CMakeLists.txt +++ b/libloragw/CMakeLists.txt -@@ -13,6 +13,9 @@ option(DEBUG_GPIO "Active debug mode in GPIO module" OFF) +@@ -13,6 +13,9 @@ option(DEBUG_GPIO "Active debug mode in option(DEBUG_LBT "Active debug mode in LBT module" OFF) option(DEBUG_GPS "Active debug mode in GPS module" OFF) @@ -22,7 +20,7 @@ index b2102ae..32abf51 100644 message("-- Build with debug AUX: ${DEBUG_AUX}") message("-- Build with debug SPI: ${DEBUG_SPI}") message("-- Build with debug REG: ${DEBUG_REG}") -@@ -20,6 +23,8 @@ message("-- Build with debug HAL: ${DEBUG_HAL}") +@@ -20,6 +23,8 @@ message("-- Build with debug HAL: ${DEBU message("-- Build with debug GPIO: ${DEBUG_GPIO}") message("-- Build with debug LBT: ${DEBUG_LBT}") message("-- Build with debug GPS: ${DEBUG_GPS}") @@ -40,6 +38,3 @@ index b2102ae..32abf51 100644 ) target_sources(${TARGET} --- -2.20.1 - diff --git a/net/miniupnpc/patches/100-no-fPIC.patch b/net/miniupnpc/patches/100-no-fPIC.patch index ce4c6752ca..f0b73b4747 100644 --- a/net/miniupnpc/patches/100-no-fPIC.patch +++ b/net/miniupnpc/patches/100-no-fPIC.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,12 +39,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") +@@ -41,12 +41,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") target_compile_definitions(miniupnpc-private INTERFACE _DARWIN_C_SOURCE) endif () diff --git a/net/miniupnpd/patches/200-remove-default-cflags.patch b/net/miniupnpd/patches/200-remove-default-cflags.patch index 462060450d..0a1ba0a233 100644 --- a/net/miniupnpd/patches/200-remove-default-cflags.patch +++ b/net/miniupnpd/patches/200-remove-default-cflags.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -24,16 +24,16 @@ +@@ -25,16 +25,16 @@ CONFIG_OPTIONS ?= $(cat .configure.cache CONFIG_OPTIONS += --firewall=iptables #CFLAGS = -O -g -DDEBUG CFLAGS ?= -Os diff --git a/net/miniupnpd/patches/300-macos-compat.patch b/net/miniupnpd/patches/300-macos-compat.patch index ccd5de9938..12b5f24880 100644 --- a/net/miniupnpd/patches/300-macos-compat.patch +++ b/net/miniupnpd/patches/300-macos-compat.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -94,13 +94,13 @@ $(info please install uuid-dev package / +@@ -95,13 +95,13 @@ $(info please install uuid-dev package / endif # ($(TEST),1) endif # ($(TARGET_OPENWRT,) @@ -20,7 +20,7 @@ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o -@@ -140,11 +140,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8 +@@ -141,11 +141,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8 $(INSTALL) $(SRCDIR)/netfilter/ip6tables_init.sh $(DESTDIR)$(ETCINSTALLDIR) $(INSTALL) $(SRCDIR)/netfilter/ip6tables_removeall.sh $(DESTDIR)$(ETCINSTALLDIR) $(INSTALL) $(SRCDIR)/netfilter/miniupnpd_functions.sh $(DESTDIR)$(ETCINSTALLDIR) diff --git a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch index 1cd97e3364..55551eb301 100644 --- a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch +++ b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch @@ -9,8 +9,6 @@ Date: Sun Jul 5 10:42:52 2020 +0800 Signed-off-by: Chen Minqiang -diff --git a/getifaddr.c b/getifaddr.c -index 7c09064..46cae8c 100644 --- a/getifaddr.c +++ b/getifaddr.c @@ -25,6 +25,7 @@ @@ -33,11 +31,9 @@ index 7c09064..46cae8c 100644 for (i = 0; i < sizeof(reserved)/sizeof(reserved[0]); ++i) { if ((address >> reserved[i].rmask) == (reserved[i].address >> reserved[i].rmask)) return 1; -diff --git a/miniupnpd.c b/miniupnpd.c -index e9f9f61..86b4200 100644 --- a/miniupnpd.c +++ b/miniupnpd.c -@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct runtime_vars * v) +@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct run case UPNPEXT_IP: use_ext_ip_addr = ary_options[i].value; break; @@ -48,8 +44,6 @@ index e9f9f61..86b4200 100644 case UPNPEXT_PERFORM_STUN: if(strcmp(ary_options[i].value, "yes") == 0) SETFLAG(PERFORMSTUNMASK); -diff --git a/miniupnpd.conf b/miniupnpd.conf -index 6274f67..c614192 100644 --- a/miniupnpd.conf +++ b/miniupnpd.conf @@ -9,6 +9,8 @@ @@ -61,8 +55,6 @@ index 6274f67..c614192 100644 # WAN interface must have public IP address. Otherwise it is behind NAT # and port forwarding is impossible. In some cases WAN interface can be # behind unrestricted NAT 1:1 when all incoming traffic is NAT-ed and -diff --git a/options.c b/options.c -index 05fa317..3711094 100644 --- a/options.c +++ b/options.c @@ -34,6 +34,7 @@ static const struct { @@ -73,8 +65,6 @@ index 05fa317..3711094 100644 { UPNPEXT_PERFORM_STUN, "ext_perform_stun" }, { UPNPEXT_STUN_HOST, "ext_stun_host" }, { UPNPEXT_STUN_PORT, "ext_stun_port" }, -diff --git a/options.h b/options.h -index 96cdbbf..34c698f 100644 --- a/options.h +++ b/options.h @@ -21,6 +21,7 @@ enum upnpconfigoptions { @@ -85,8 +75,6 @@ index 96cdbbf..34c698f 100644 UPNPEXT_PERFORM_STUN, /* ext_perform_stun */ UPNPEXT_STUN_HOST, /* ext_stun_host */ UPNPEXT_STUN_PORT, /* ext_stun_port */ -diff --git a/testgetifaddr.c b/testgetifaddr.c -index 8045b89..b5cdbb4 100644 --- a/testgetifaddr.c +++ b/testgetifaddr.c @@ -13,6 +13,8 @@ @@ -98,8 +86,6 @@ index 8045b89..b5cdbb4 100644 #if defined(__sun) /* solaris 10 does not define LOG_PERROR */ #define LOG_PERROR 0 -diff --git a/testportinuse.c b/testportinuse.c -index 98574c6..507f830 100644 --- a/testportinuse.c +++ b/testportinuse.c @@ -14,6 +14,8 @@ @@ -111,8 +97,6 @@ index 98574c6..507f830 100644 int main(int argc, char * * argv) { #ifndef CHECK_PORTINUSE -diff --git a/upnpglobalvars.h b/upnpglobalvars.h -index a474353..4f5bbdd 100644 --- a/upnpglobalvars.h +++ b/upnpglobalvars.h @@ -84,6 +84,8 @@ extern int runtime_flags; diff --git a/net/mstpd/patches/010-bsd.patch b/net/mstpd/patches/010-bsd.patch index 45ecb3f759..120a0dbd40 100644 --- a/net/mstpd/patches/010-bsd.patch +++ b/net/mstpd/patches/010-bsd.patch @@ -1,6 +1,6 @@ --- a/hmac_md5.c +++ b/hmac_md5.c -@@ -356,10 +356,10 @@ caddr_t digest; /* caller digest to be filled in */ +@@ -356,10 +356,10 @@ caddr_t digest; /* caller di */ /* start out by storing key in pads */ diff --git a/net/net-snmp/patches/110-debian-makefiles.patch b/net/net-snmp/patches/110-debian-makefiles.patch index 7b71ed0874..2cb2715aa8 100644 --- a/net/net-snmp/patches/110-debian-makefiles.patch +++ b/net/net-snmp/patches/110-debian-makefiles.patch @@ -1,7 +1,6 @@ -diff -uNr a/local/Makefile.in b/local/Makefile.in ---- a/local/Makefile.in 2014-02-20 08:36:42.000000000 +0800 -+++ b/local/Makefile.in 2014-05-27 13:21:34.245223503 +0800 -@@ -101,7 +101,7 @@ +--- a/local/Makefile.in ++++ b/local/Makefile.in +@@ -101,7 +101,7 @@ tkmib.made: $(srcdir)/tkmib mib2c.made: $(srcdir)/mib2c if test "x$(PERL)" != "x" ; then \ @@ -10,10 +9,9 @@ diff -uNr a/local/Makefile.in b/local/Makefile.in else \ touch mib2c.made; \ fi -diff -uNr a/Makefile.top b/Makefile.top ---- a/Makefile.top 2014-02-20 08:36:42.000000000 +0800 -+++ b/Makefile.top 2014-05-27 13:26:53.023737120 +0800 -@@ -28,6 +28,7 @@ +--- a/Makefile.top ++++ b/Makefile.top +@@ -28,6 +28,7 @@ man8dir = $(mandir)/man8 snmplibdir = $(datadir)/snmp mibdir = $(snmplibdir)/mibs persistentdir = @PERSISTENT_DIRECTORY@ @@ -21,10 +19,9 @@ diff -uNr a/Makefile.top b/Makefile.top DESTDIR = @INSTALL_PREFIX@ INSTALL_PREFIX = $(DESTDIR) -diff -uNr a/mibs/Makefile.in b/mibs/Makefile.in ---- a/mibs/Makefile.in 2014-02-20 08:36:42.000000000 +0800 -+++ b/mibs/Makefile.in 2014-05-27 13:25:07.151988585 +0800 -@@ -47,11 +47,15 @@ +--- a/mibs/Makefile.in ++++ b/mibs/Makefile.in +@@ -47,11 +47,15 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-M UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \ UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt diff --git a/net/net-snmp/patches/170-ldflags.patch b/net/net-snmp/patches/170-ldflags.patch index 656fdede49..dd1b9fe255 100644 --- a/net/net-snmp/patches/170-ldflags.patch +++ b/net/net-snmp/patches/170-ldflags.patch @@ -1,6 +1,6 @@ --- a/Makefile.top +++ b/Makefile.top -@@ -87,7 +87,7 @@ LIBCURRENT = 30 +@@ -87,7 +87,7 @@ LIBCURRENT = 35 LIBAGE = 0 LIBREVISION = 0 diff --git a/net/net-snmp/patches/910-signal.patch b/net/net-snmp/patches/910-signal.patch index a70d42f7eb..45cd1fac27 100644 --- a/net/net-snmp/patches/910-signal.patch +++ b/net/net-snmp/patches/910-signal.patch @@ -10,13 +10,9 @@ https://github.com/net-snmp/net-snmp/pull/162. 1 file changed, 28 insertions(+), 83 deletions(-) mode change 100644 => 100755 apps/snmpnetstat/if.c -diff --git a/apps/snmpnetstat/if.c b/apps/snmpnetstat/if.c -old mode 100644 -new mode 100755 -index 16768151d..84b87b531 --- a/apps/snmpnetstat/if.c +++ b/apps/snmpnetstat/if.c -@@ -64,8 +64,6 @@ +@@ -64,8 +64,6 @@ static char *rcsid = "$OpenBSD: if.c,v 1 #define NO 0 static void sidewaysintpr(u_int); @@ -60,7 +56,7 @@ index 16768151d..84b87b531 /* * Retrieve the interface addressing information * XXX - This could also be extended to handle non-IP interfaces -@@ -845,84 +871,3 @@ sidewaysintpr(unsigned int interval) +@@ -845,84 +871,3 @@ loop: goto loop; /*NOTREACHED*/ } diff --git a/net/netatalk/patches/010-gcc10.patch b/net/netatalk/patches/010-gcc10.patch index 8652b68ca1..cbf2177e6e 100644 --- a/net/netatalk/patches/010-gcc10.patch +++ b/net/netatalk/patches/010-gcc10.patch @@ -7,8 +7,6 @@ Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries etc/afpd/directory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 --- a/etc/afpd/directory.h +++ b/etc/afpd/directory.h @@ -91,7 +91,7 @@ struct maccess { diff --git a/net/netcat/patches/001-netcat_flag_count.patch b/net/netcat/patches/001-netcat_flag_count.patch index 44ee9e1f96..004fe94616 100644 --- a/net/netcat/patches/001-netcat_flag_count.patch +++ b/net/netcat/patches/001-netcat_flag_count.patch @@ -1,8 +1,6 @@ -Index: netcat-0.7.1/src/flagset.c -=================================================================== ---- netcat-0.7.1.orig/src/flagset.c 2009-02-06 19:56:01.000000000 +0100 -+++ netcat-0.7.1/src/flagset.c 2009-02-06 19:56:13.000000000 +0100 -@@ -134,7 +134,7 @@ +--- a/src/flagset.c ++++ b/src/flagset.c +@@ -134,7 +134,7 @@ unsigned short netcat_flag_next(unsigned int netcat_flag_count(void) { @@ -11,7 +9,7 @@ Index: netcat-0.7.1/src/flagset.c register int i; int ret = 0; -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ int netcat_flag_count(void) Assumed that the bit number 1 is the sign, and that we will shift the bit 1 (or the bit that takes its place later) until the the most right, WHY it has to keep the wrong sign? */ diff --git a/net/netdiscover/patches/010-gcc10.patch b/net/netdiscover/patches/010-gcc10.patch index 9a679ec212..552c8bd1b7 100644 --- a/net/netdiscover/patches/010-gcc10.patch +++ b/net/netdiscover/patches/010-gcc10.patch @@ -74,7 +74,7 @@ extern void parseable_scan_end(); void *inject_arp(void *arg); -@@ -52,6 +53,9 @@ void *parsable_screen_refresh(void *arg); +@@ -52,6 +53,9 @@ void *parsable_screen_refresh(void *arg) void scan_range(char *disp, char *sip); void usage(); diff --git a/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch b/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch index b7aae876e3..0f9d2e070d 100644 --- a/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch +++ b/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig configure | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -diff --git a/configure b/configure -index 510826a..ceda000 100755 --- a/configure +++ b/configure @@ -221,8 +221,8 @@ EOF @@ -149,6 +147,3 @@ index 510826a..ceda000 100755 if [ ! -x $TMPDIR/nettest ] ; then echo "[NO]" MISSING_DEFS=1 --- -2.20.1 - diff --git a/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch b/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch index 382b4f5ccb..181ffbee23 100644 --- a/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch +++ b/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig configure | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/configure b/configure -index ceda000..f843d64 100755 --- a/configure +++ b/configure @@ -434,11 +434,8 @@ int main(void) @@ -25,6 +23,3 @@ index ceda000..f843d64 100755 if [ ! -x $TMPDIR/ncursestest ] ; then echo "[NO]" MISSING_DEFS=1 --- -2.20.1 - diff --git a/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch b/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch index 65b4b7affb..1abeaadd9b 100644 --- a/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch +++ b/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig flowtop/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/flowtop/Makefile b/flowtop/Makefile -index e001ce8..aeee049 100644 --- a/flowtop/Makefile +++ b/flowtop/Makefile @@ -1,7 +1,6 @@ @@ -31,6 +29,3 @@ index e001ce8..aeee049 100644 flowtop-confs = tcp.conf \ udp.conf \ --- -2.20.1 - diff --git a/net/nginx/patches/104-endianness_fix.patch b/net/nginx/patches/104-endianness_fix.patch index 081bcdb00a..4d8255e936 100644 --- a/net/nginx/patches/104-endianness_fix.patch +++ b/net/nginx/patches/104-endianness_fix.patch @@ -1,5 +1,3 @@ -diff --git a/auto/endianness b/auto/endianness -index 1b552b6b..2b6f9ea4 100644 --- a/auto/endianness +++ b/auto/endianness @@ -12,6 +12,16 @@ checking for system byte ordering diff --git a/net/nginx/patches/201-ignore-invalid-options.patch b/net/nginx/patches/201-ignore-invalid-options.patch index 88b521353c..d208bf5076 100644 --- a/net/nginx/patches/201-ignore-invalid-options.patch +++ b/net/nginx/patches/201-ignore-invalid-options.patch @@ -1,6 +1,6 @@ --- a/auto/options +++ b/auto/options -@@ -396,8 +396,7 @@ $0: warning: the \"--with-sha1-asm\" opt +@@ -400,8 +400,7 @@ $0: warning: the \"--with-sha1-asm\" opt --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; *) diff --git a/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch b/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch index 400ea1a294..7cf808c91b 100644 --- a/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch +++ b/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch @@ -15,11 +15,9 @@ Subject: [PATCH] Avoid 'using namespace std' causing name conflicts. Fixes nping/utils.h | 2 -- 8 files changed, 8 insertions(+), 14 deletions(-) -diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc -index ccdcf9c2d0..a824340cd2 100644 --- a/nping/EchoServer.cc +++ b/nping/EchoServer.cc -@@ -199,7 +199,7 @@ NEPContext *EchoServer::getClientContext(nsock_iod iod){ +@@ -199,7 +199,7 @@ NEPContext *EchoServer::getClientContext * the context could not be found. */ int EchoServer::destroyClientContext(clientid_t clnt){ bool deleted=false; @@ -28,8 +26,6 @@ index ccdcf9c2d0..a824340cd2 100644 /* Iterate through the context array and delete the one that belongs to clnt */ for ( it=this->client_ctx.begin(); itclient_ctx.end(); it++){ if(it->getIdentifier()==clnt){ -diff --git a/nping/EchoServer.h b/nping/EchoServer.h -index c3dece6341..c9fee6de9e 100644 --- a/nping/EchoServer.h +++ b/nping/EchoServer.h @@ -136,15 +136,13 @@ @@ -49,8 +45,6 @@ index c3dece6341..c9fee6de9e 100644 clientid_t client_id_count; /* Methods */ -diff --git a/nping/NEPContext.h b/nping/NEPContext.h -index 5e470d7551..32b8be48d6 100644 --- a/nping/NEPContext.h +++ b/nping/NEPContext.h @@ -135,7 +135,6 @@ @@ -70,8 +64,6 @@ index 5e470d7551..32b8be48d6 100644 struct sockaddr_storage clnt_addr; u8 *generateKey(int key_type, size_t *final_len); -diff --git a/nping/NpingTargets.h b/nping/NpingTargets.h -index 61bb356f39..3a9a2145af 100644 --- a/nping/NpingTargets.h +++ b/nping/NpingTargets.h @@ -137,8 +137,6 @@ @@ -92,8 +84,6 @@ index 61bb356f39..3a9a2145af 100644 }; /* End of class NpingTargets */ -diff --git a/nping/ProbeMode.h b/nping/ProbeMode.h -index aa86939e02..313776d862 100644 --- a/nping/ProbeMode.h +++ b/nping/ProbeMode.h @@ -135,11 +135,9 @@ @@ -108,8 +98,6 @@ index aa86939e02..313776d862 100644 #define PKT_TYPE_TCP_CONNECT 1 #define PKT_TYPE_UDP_NORMAL 2 -diff --git a/nping/nping.cc b/nping/nping.cc -index 9de151a7be..40df912a88 100644 --- a/nping/nping.cc +++ b/nping/nping.cc @@ -150,7 +150,6 @@ @@ -120,8 +108,6 @@ index 9de151a7be..40df912a88 100644 NpingOps o; EchoClient ec; EchoServer es; -diff --git a/nping/utils.h b/nping/utils.h -index c3516cf29f..5de6b64b89 100644 --- a/nping/utils.h +++ b/nping/utils.h @@ -143,8 +143,6 @@ diff --git a/net/nmap/patches/020-Python3-port-of-ndiff.patch b/net/nmap/patches/020-Python3-port-of-ndiff.patch index ccf09c6e15..4151cec69d 100644 --- a/net/nmap/patches/020-Python3-port-of-ndiff.patch +++ b/net/nmap/patches/020-Python3-port-of-ndiff.patch @@ -25,8 +25,6 @@ Resolves: #1484 7 files changed, 337 insertions(+), 332 deletions(-) mode change 100644 => 100755 ndiff/setup.py -diff --git a/.travis.yml b/.travis.yml -index 145ebc6..9bb50d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,13 @@ compiler: @@ -44,8 +42,6 @@ index 145ebc6..9bb50d6 100644 env: - SSL_FLAG="--without-openssl" LUA_FLAG="--without-liblua" -diff --git a/Makefile.in b/Makefile.in -index 7ac5ae5..a0152f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ @@ -82,8 +78,6 @@ index 7ac5ae5..a0152f4 100644 check-nsock: @cd $(NSOCKDIR)/src && $(MAKE) check -diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py -index 043273f..abbd1c5 100755 --- a/ndiff/ndiff.py +++ b/ndiff/ndiff.py @@ -1,4 +1,4 @@ @@ -92,7 +86,7 @@ index 043273f..abbd1c5 100755 # Ndiff # -@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] +@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ import xml.sax import xml.sax.saxutils import xml.dom.minidom @@ -488,7 +482,7 @@ index 043273f..abbd1c5 100755 def script_result_diffs_to_dom_fragment(elem, script_results_a, -@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, +@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment( if len(script_results_a) == 0 and len(script_results_b) == 0: return document.createDocumentFragment() elif len(script_results_b) == 0: @@ -934,7 +928,7 @@ index 043273f..abbd1c5 100755 class NmapContentHandler(xml.sax.handler.ContentHandler): -@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler self.current_port = None self._start_elem_handlers = { @@ -971,7 +965,7 @@ index 043273f..abbd1c5 100755 } def parent_element(self): -@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler def _start_nmaprun(self, name, attrs): assert self.parent_element() is None if "start" in attrs: @@ -1061,7 +1055,7 @@ index 043273f..abbd1c5 100755 'attribute; assuming 0.' % ( name, self.current_host.format_name())) count = 0 -@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler try: count = int(count) except ValueError: @@ -1192,7 +1186,7 @@ index 043273f..abbd1c5 100755 self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) def _end_host(self, name): -@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): +@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGen def frag(self, frag): for node in frag.childNodes: @@ -1283,8 +1277,6 @@ index 043273f..abbd1c5 100755 sys.exit(EXIT_ERROR) if output_format == "text": -diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py -index 2fa4ae0..27fc525 100755 --- a/ndiff/ndifftest.py +++ b/ndiff/ndifftest.py @@ -1,4 +1,4 @@ @@ -1464,7 +1456,7 @@ index 2fa4ae0..27fc525 100755 class ScanDiffSub(ScanDiff): -@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): +@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCa a.load_from_file("test-scans/empty.xml") b = Scan() b.load_from_file("test-scans/simple.xml") @@ -1473,7 +1465,7 @@ index 2fa4ae0..27fc525 100755 self.scan_diff = ScanDiffXML(a, b, f) self.scan_diff.output() self.xml = f.getvalue() -@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): +@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCa def test_well_formed(self): try: document = xml.dom.minidom.parseString(self.xml) @@ -1495,8 +1487,6 @@ index 2fa4ae0..27fc525 100755 if port.state == state: del host.ports[port.spec] host.extraports = diff.host_b.extraports.copy() -diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff -index 8517c07..4671e73 100755 --- a/ndiff/scripts/ndiff +++ b/ndiff/scripts/ndiff @@ -1,4 +1,4 @@ @@ -1505,7 +1495,7 @@ index 8517c07..4671e73 100755 # Ndiff # -@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): +@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure try: import ndiff @@ -1527,13 +1517,9 @@ index 8517c07..4671e73 100755 sys.exit(1) import ndiff -diff --git a/ndiff/setup.py b/ndiff/setup.py -old mode 100644 -new mode 100755 -index b5e254c..c49bcf3 --- a/ndiff/setup.py +++ b/ndiff/setup.py -@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): +@@ -94,7 +94,7 @@ class checked_install(distutils.command. self.saved_prefix = sys.prefix try: distutils.command.install.install.finalize_options(self) @@ -1542,7 +1528,7 @@ index b5e254c..c49bcf3 raise distutils.errors.DistutilsPlatformError(str(e) + """ Installing your distribution's python-dev package may solve this problem.""") -@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") +@@ -155,13 +155,13 @@ Installing your distribution's python-de #!/usr/bin/env python import errno, os, os.path, sys @@ -1619,7 +1605,7 @@ index b5e254c..c49bcf3 finally: f.close() -@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command # Read the list of installed files. try: f = open(INSTALLED_FILES_NAME, "r") @@ -1628,7 +1614,7 @@ index b5e254c..c49bcf3 if e.errno == errno.ENOENT: log.error("Couldn't open the installation record '%s'. " "Have you installed yet?" % INSTALLED_FILES_NAME) -@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command try: if not self.dry_run: os.remove(file) @@ -1637,7 +1623,7 @@ index b5e254c..c49bcf3 log.error(str(e)) # Delete the directories. First reverse-sort the normalized paths by # length so that child directories are deleted before their parents. -@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command log.info("Removing the directory '%s'." % dir) if not self.dry_run: os.rmdir(dir) @@ -1646,8 +1632,6 @@ index b5e254c..c49bcf3 if e.errno == errno.ENOTEMPTY: log.info("Directory '%s' not empty; not removing." % dir) else: -diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py -index 9ba612a..fd251fe 100755 --- a/ndiff/test-scans/anonymize.py +++ b/ndiff/test-scans/anonymize.py @@ -1,4 +1,4 @@ diff --git a/net/ntpclient/patches/200-time.patch b/net/ntpclient/patches/200-time.patch index 6456f30937..38138e179c 100644 --- a/net/ntpclient/patches/200-time.patch +++ b/net/ntpclient/patches/200-time.patch @@ -34,7 +34,7 @@ #include #include #include -@@ -181,7 +182,7 @@ static void set_time(struct ntptime *new) +@@ -181,7 +182,7 @@ static void set_time(struct ntptime *new exit(1); } if (debug) { @@ -43,7 +43,7 @@ } #else /* Traditional Linux way to set the system clock -@@ -196,7 +197,7 @@ static void set_time(struct ntptime *new) +@@ -196,7 +197,7 @@ static void set_time(struct ntptime *new exit(1); } if (debug) { diff --git a/net/oor/patches/010-gcc10.patch b/net/oor/patches/010-gcc10.patch index 17242aa22e..303716e996 100644 --- a/net/oor/patches/010-gcc10.patch +++ b/net/oor/patches/010-gcc10.patch @@ -1,6 +1,6 @@ --- a/oor/data-plane/tun/tun.c +++ b/oor/data-plane/tun/tun.c -@@ -53,6 +53,8 @@ int tun_rm_fwd_from_entry(lisp_addr_t *eid_prefix, uint8_t is_local); +@@ -53,6 +53,8 @@ int tun_rm_fwd_from_entry(lisp_addr_t *e tun_dplane_data_t * tun_dplane_data_new_init(oor_encap_t encap_type, glist_t *allowed_dst_eids); void tun_dplane_data_free(tun_dplane_data_t *data); diff --git a/net/open-isns/patches/01-security_mode.patch b/net/open-isns/patches/01-security_mode.patch index dc827bd96e..e6d962ef27 100644 --- a/net/open-isns/patches/01-security_mode.patch +++ b/net/open-isns/patches/01-security_mode.patch @@ -12,11 +12,9 @@ Subject: [PATCH] Fix compiler issue when not in security mode socket.c | 5 +++-- 6 files changed, 35 insertions(+), 19 deletions(-) -diff --git a/client.c b/client.c -index 8487877..fda26be 100644 --- a/client.c +++ b/client.c -@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns_client_t *clnt, +@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns /* * Create a security context */ @@ -40,7 +38,7 @@ index 8487877..fda26be 100644 ctx = isns_create_dsa_context(); if (ctx == NULL) isns_fatal("Unable to create security context\n"); -@@ -174,8 +169,19 @@ __create_security_context(const char *name, const char *auth_key, +@@ -174,8 +169,19 @@ __create_security_context(const char *na } return ctx; @@ -61,11 +59,9 @@ index 8487877..fda26be 100644 /* * Create the default security context -diff --git a/db-policy.c b/db-policy.c -index b1c46e2..d4a0cba 100644 --- a/db-policy.c +++ b/db-policy.c -@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keystore_t *store, +@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keysto /* * Load a DSA key from the DB store */ @@ -78,7 +74,7 @@ index b1c46e2..d4a0cba 100644 isns_db_keystore_t *store = (isns_db_keystore_t *) store_base; isns_object_t *obj; const void *key_data; -@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t *store_base, +@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t return NULL; return isns_dsa_decode_public(key_data, key_size); @@ -97,8 +93,6 @@ index b1c46e2..d4a0cba 100644 /* * Retrieve policy from database -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 4174480..e5ed037 100644 --- a/include/libisns/util.h +++ b/include/libisns/util.h @@ -14,6 +14,7 @@ @@ -109,8 +103,6 @@ index 4174480..e5ed037 100644 #define array_num_elements(a) (sizeof(a) / sizeof((a)[0])) -diff --git a/isnsadm.c b/isnsadm.c -index 7a96007..94c705e 100644 --- a/isnsadm.c +++ b/isnsadm.c @@ -1162,7 +1162,7 @@ generate_key_callback(void) @@ -122,8 +114,6 @@ index 7a96007..94c705e 100644 { isns_fatal("Authentication disabled in this build\n"); return NULL; -diff --git a/security.c b/security.c -index 673a26e..68eb779 100644 --- a/security.c +++ b/security.c @@ -408,32 +408,34 @@ isns_security_init(void) @@ -167,11 +157,9 @@ index 673a26e..68eb779 100644 { return NULL; } -diff --git a/socket.c b/socket.c -index da9f5dc..a76d593 100644 --- a/socket.c +++ b/socket.c -@@ -322,8 +322,9 @@ isns_pdu_authenticate(isns_security_t *sec, +@@ -322,8 +322,9 @@ failed: } #else /* WITH_SECURITY */ static int diff --git a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch index 2d966dd3a4..9a48370182 100644 --- a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch +++ b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch @@ -13,8 +13,6 @@ shows up only on 586 (32-bit). isnsdd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index e4f3995..d956e58 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh) @@ -26,11 +24,9 @@ index e4f3995..d956e58 100644 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" fi -diff --git a/isnsdd.c b/isnsdd.c -index 58825cc..9cedb9f 100644 --- a/isnsdd.c +++ b/isnsdd.c -@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr) +@@ -401,7 +401,7 @@ check_portal_registration(__attribute__( continue; last_modified = isns_object_last_modified(obj); diff --git a/net/open-isns/patches/03-include_poll_h.patch b/net/open-isns/patches/03-include_poll_h.patch index cf87b51b5b..5183fd62e5 100644 --- a/net/open-isns/patches/03-include_poll_h.patch +++ b/net/open-isns/patches/03-include_poll_h.patch @@ -9,8 +9,6 @@ https://pubs.opengroup.org/onlinepubs/009695399/basedefs/poll.h.html socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/socket.c b/socket.c -index a76d593..432a9bd 100644 --- a/socket.c +++ b/socket.c @@ -5,7 +5,7 @@ diff --git a/net/open-isns/patches/04-ignore_write.patch b/net/open-isns/patches/04-ignore_write.patch index 012bea7d4f..3affdcd0ba 100644 --- a/net/open-isns/patches/04-ignore_write.patch +++ b/net/open-isns/patches/04-ignore_write.patch @@ -9,8 +9,6 @@ system call, so check the return value. pki.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -diff --git a/pki.c b/pki.c -index 486d9bb..57ea664 100644 --- a/pki.c +++ b/pki.c @@ -9,12 +9,13 @@ @@ -28,7 +26,7 @@ index 486d9bb..57ea664 100644 #include #include "security.h" #include -@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filename) +@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filenam return dsa; } @@ -75,7 +73,7 @@ index 486d9bb..57ea664 100644 return 0; } -@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filename) +@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filenam dsa = DSA_generate_parameters(dsa_key_bits, NULL, 0, NULL, NULL, isns_dsa_param_gen_callback, NULL); #endif diff --git a/net/open-isns/patches/20-signals.patch b/net/open-isns/patches/20-signals.patch index 8982847941..8b9d999b66 100644 --- a/net/open-isns/patches/20-signals.patch +++ b/net/open-isns/patches/20-signals.patch @@ -8,8 +8,6 @@ The man page says that these are deprecated. Use sugprocmask as a replacement. include/libisns/util.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -diff --git a/include/libisns/util.h b/include/libisns/util.h -index e5ed037..f1b97f0 100644 --- a/include/libisns/util.h +++ b/include/libisns/util.h @@ -41,14 +41,22 @@ char * print_size(unsigned long); diff --git a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch index 90ad6ffa65..46cfa5822a 100644 --- a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch +++ b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch @@ -16,11 +16,9 @@ Signed-off-by: Helmut Schaa lib/netdev-linux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c -index fe7fb9b29..63407ba1b 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c -@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off, +@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev unsigned int old_flags, new_flags; int error = 0; diff --git a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch index 7903afed3d..2c86a3048f 100644 --- a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch +++ b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch @@ -9,8 +9,6 @@ Signed-off-by: Yousong Zhou m4/openvswitch.m4 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index 27ef9e4b4..7effb5fec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ endif @@ -22,8 +20,6 @@ index 27ef9e4b4..7effb5fec 100644 ALL_LOCAL = BUILT_SOURCES = -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index 6fe79297e..f2e0169f8 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -383,6 +383,8 @@ else: diff --git a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch index 363bc95fc8..373c6a6d38 100644 --- a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch +++ b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou utilities/ovs-lib.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in -index d646b444a..dee63dece 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -159,7 +159,10 @@ install_dir () { diff --git a/net/openvswitch/patches/0004-build-trim-build.patch b/net/openvswitch/patches/0004-build-trim-build.patch index 36fb946fc4..19ea959ef6 100644 --- a/net/openvswitch/patches/0004-build-trim-build.patch +++ b/net/openvswitch/patches/0004-build-trim-build.patch @@ -8,8 +8,6 @@ Signed-off-by: Yousong Zhou Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 7effb5fec..d6df91e8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -475,12 +475,10 @@ dist-docs: diff --git a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch index 305d2a413e..3993c60a24 100644 --- a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch +++ b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou datapath/linux/Makefile.main.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in -index 6db4aa3ab..6f295387a 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -68,7 +68,7 @@ ifeq (,$(wildcard $(CONFIG_FILE))) diff --git a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch index 9db7ca9120..86c1d41bff 100644 --- a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch +++ b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou m4/openvswitch.m4 | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) -diff --git a/lib/automake.mk b/lib/automake.mk -index 380a67228..610f3d940 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -10,6 +10,8 @@ lib_LTLIBRARIES += lib/libopenvswitch.la @@ -23,8 +21,6 @@ index 380a67228..610f3d940 100644 if WIN32 -diff --git a/lib/libopenvswitch.pc.in b/lib/libopenvswitch.pc.in -index 2a3f2ca7b..c8d02eb5a 100644 --- a/lib/libopenvswitch.pc.in +++ b/lib/libopenvswitch.pc.in @@ -7,5 +7,5 @@ Name: libopenvswitch @@ -34,8 +30,6 @@ index 2a3f2ca7b..c8d02eb5a 100644 -Libs.private: @LIBS@ +Libs.private: @LIBS@ @SSL_LIBS@ @CAPNG_LDADD@ @LIBBPF_LDADD@ @LIBUNBOUND_LDADD@ @LIBUNWIND_LDADD@ Cflags: -I${includedir}/openvswitch -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index f2e0169f8..e000c1cc5 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -657,7 +657,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], diff --git a/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch b/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch index e93deb19ce..75da5a2497 100644 --- a/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch +++ b/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch @@ -8,8 +8,6 @@ Signed-off-by: Yousong Zhou configure.ac | 1 - 1 file changed, 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 2bcd1945b..ad550fff8 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ OVS_CHECK_LINUX_HOST diff --git a/net/ovn/patches/0002-build-skip-tests-and-docs.patch b/net/ovn/patches/0002-build-skip-tests-and-docs.patch index 342dfabf03..12ef25de0b 100644 --- a/net/ovn/patches/0002-build-skip-tests-and-docs.patch +++ b/net/ovn/patches/0002-build-skip-tests-and-docs.patch @@ -8,11 +8,9 @@ Signed-off-by: Yousong Zhou Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 04400e184..c12cfcd11 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -488,11 +488,9 @@ dist-docs: +@@ -483,11 +483,9 @@ dist-docs: include automake.mk @@ -22,5 +20,5 @@ index 04400e184..c12cfcd11 100644 include utilities/automake.mk -include tests/automake.mk include include/automake.mk - include third-party/automake.mk include debian/automake.mk + include lib/ovsdb_automake.mk diff --git a/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch b/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch index 46a7daadd6..86a4995514 100644 --- a/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch +++ b/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou utilities/ovn-lib.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in -index af1b72edb..f6ab5581c 100644 --- a/utilities/ovn-lib.in +++ b/utilities/ovn-lib.in @@ -54,7 +54,10 @@ ovn_install_dir () { diff --git a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch index 62a4c8b30b..9ac7ab8e7a 100644 --- a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch +++ b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch @@ -1,5 +1,3 @@ -diff --git a/pdns/Makefile.am b/pdns/Makefile.am -index 2df5fa7..2246088 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -71,7 +71,6 @@ CLEANFILES = \ @@ -10,7 +8,7 @@ index 2df5fa7..2246088 100644 apidocfiles.h \ api-swagger.yaml \ api-swagger.json -@@ -99,7 +98,6 @@ apidocfiles.h: api-swagger.yaml api-swagger.json +@@ -99,7 +98,6 @@ apidocfiles.h: api-swagger.yaml api-swag ./incfiles $^ > $@ noinst_SCRIPTS = pdns.init diff --git a/net/pen/patches/010-deprecated-openssl.patch b/net/pen/patches/010-deprecated-openssl.patch index b8acbab63e..c1023d1fd2 100644 --- a/net/pen/patches/010-deprecated-openssl.patch +++ b/net/pen/patches/010-deprecated-openssl.patch @@ -8,11 +8,9 @@ Subject: [PATCH] Fix compilation under OpenSSL 1.1 without deprecated APIs ssl.h | 2 ++ 2 files changed, 6 insertions(+) -diff --git a/ssl.c b/ssl.c -index 6c67879..1a222bb 100644 --- a/ssl.c +++ b/ssl.c -@@ -359,7 +359,9 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile, +@@ -359,7 +359,9 @@ static SSL_CTX *ssl_create_context(char debug("continuing anyway..."); } } @@ -22,7 +20,7 @@ index 6c67879..1a222bb 100644 SSL_CTX_set_info_callback(ssl_context, ssl_info_cb); SSL_CTX_set_tlsext_status_cb(ssl_context, ssl_stapling_cb); SSL_CTX_set_tlsext_servername_callback(ssl_context, ssl_sni_cb); -@@ -405,8 +407,10 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile, +@@ -405,8 +407,10 @@ static SSL_CTX *ssl_create_context(char int ssl_init(void) { @@ -33,8 +31,6 @@ index 6c67879..1a222bb 100644 ssl_context = ssl_create_context(keyfile, certfile, cacert_dir, cacert_file); if (ssl_context == NULL) { error("Unable to create default context"); -diff --git a/ssl.h b/ssl.h -index a0dcd18..b63161e 100644 --- a/ssl.h +++ b/ssl.h @@ -1,6 +1,8 @@ @@ -46,4 +42,3 @@ index a0dcd18..b63161e 100644 #define SRV_SSL_V23 0 #define SRV_SSL_V2 1 - diff --git a/net/port-mirroring/patches/020-time.patch b/net/port-mirroring/patches/020-time.patch index 224ed27381..63350fc9e0 100644 --- a/net/port-mirroring/patches/020-time.patch +++ b/net/port-mirroring/patches/020-time.patch @@ -1,6 +1,6 @@ --- a/src/main.c +++ b/src/main.c -@@ -252,7 +252,7 @@ void packet_handler_ex(const struct pcap_pkthdr* header, const u_char* pkt_data, +@@ -252,7 +252,7 @@ void packet_handler_ex(const struct pcap if (handle == NULL || pcap_sendpacket(handle, pkt_data, header->len) != 0) { //error detected @@ -9,7 +9,7 @@ time(&nowTime); if (nowTime - cfg.init_time > ERRTIMEOUT && header->len < 1500) { -@@ -282,7 +282,7 @@ void packet_handler_ex(const struct pcap_pkthdr* header, const u_char* pkt_data, +@@ -282,7 +282,7 @@ void packet_handler_ex(const struct pcap if (handle == NULL || pcap_sendpacket(handle, buf, header->len) != 0) { //error detected diff --git a/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch b/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch index e1f1c21eb7..b982d6ade2 100644 --- a/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch +++ b/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch @@ -7,11 +7,9 @@ Signed-off-by: Christian Schoenebeck bin/radicale | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/bin/radicale b/bin/radicale -index 619aca5..7466020 100755 --- a/bin/radicale +++ b/bin/radicale -@@ -26,6 +26,13 @@ Launch the server according to configuration and command-line options. +@@ -26,6 +26,13 @@ Launch the server according to configura """ @@ -25,6 +23,3 @@ index 619aca5..7466020 100755 import radicale.__main__ --- -2.1.0 - diff --git a/net/radicale2/patches/110-disable-setup_requirements.patch b/net/radicale2/patches/110-disable-setup_requirements.patch index 9957045ae5..bb832d1443 100644 --- a/net/radicale2/patches/110-disable-setup_requirements.patch +++ b/net/radicale2/patches/110-disable-setup_requirements.patch @@ -1,7 +1,5 @@ -Index: radicale2-python3-2.1.11/setup.py -=================================================================== ---- radicale2-python3-2.1.11.orig/setup.py -+++ radicale2-python3-2.1.11/setup.py +--- a/setup.py ++++ b/setup.py @@ -67,7 +67,7 @@ setup( package_data={"radicale": WEB_FILES}, entry_points={"console_scripts": ["radicale = radicale.__main__:run"]}, diff --git a/net/radsecproxy/patches/200-logdest-on-foreground.patch b/net/radsecproxy/patches/200-logdest-on-foreground.patch index e50c45ff1e..64c9206736 100644 --- a/net/radsecproxy/patches/200-logdest-on-foreground.patch +++ b/net/radsecproxy/patches/200-logdest-on-foreground.patch @@ -1,6 +1,6 @@ --- a/radsecproxy.c +++ b/radsecproxy.c -@@ -3005,15 +3005,13 @@ int radsecproxy_main(int argc, char **argv) { +@@ -3005,15 +3005,13 @@ int radsecproxy_main(int argc, char **ar options.loglevel = loglevel; else if (options.loglevel) debug_set_level(options.loglevel); diff --git a/net/radsecproxy/patches/300-gcc10.patch b/net/radsecproxy/patches/300-gcc10.patch index 55b90114aa..352009b890 100644 --- a/net/radsecproxy/patches/300-gcc10.patch +++ b/net/radsecproxy/patches/300-gcc10.patch @@ -9,8 +9,6 @@ GCC 10 compatibility as per https://gcc.gnu.org/gcc-10/porting_to.html radsecproxy.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/radsecproxy.c b/radsecproxy.c -index a4b1211..b281e21 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -84,6 +84,7 @@ extern int optind; @@ -21,8 +19,6 @@ index a4b1211..b281e21 100644 /* minimum required declarations to avoid reordering code */ struct realm *adddynamicrealmserver(struct realm *realm, char *id); -diff --git a/radsecproxy.h b/radsecproxy.h -index 3082300..0f20f50 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -262,7 +262,7 @@ int radsrv(struct request *rq); diff --git a/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch b/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch index 2c72d43237..1195a99871 100644 --- a/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch +++ b/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch @@ -8,11 +8,9 @@ Signed-off-by: Toni Uhlig openssl_clienthello.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/openssl_clienthello.c b/openssl_clienthello.c -index 559db56..6ecabcb 100644 --- a/openssl_clienthello.c +++ b/openssl_clienthello.c -@@ -93,7 +93,9 @@ static struct lookup_table_element_t known_extensions[] = { +@@ -93,7 +93,9 @@ static struct lookup_table_element_t kno ELEMENT(TLSEXT_TYPE_certificate_authorities), #endif ELEMENT(TLSEXT_TYPE_renegotiate), @@ -22,6 +20,3 @@ index 559db56..6ecabcb 100644 { 0 } }; --- -2.20.1 - diff --git a/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch b/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch index 2736c4b285..9a6b9411ed 100644 --- a/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch +++ b/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch @@ -12,8 +12,6 @@ Signed-off-by: Rosen Penev openssl_tls.c | 5 ----- 3 files changed, 7 insertions(+), 15 deletions(-) -diff --git a/openssl.c b/openssl.c -index ba097a5..76c817b 100644 --- a/openssl.c +++ b/openssl.c @@ -22,21 +22,17 @@ @@ -40,8 +38,6 @@ index ba097a5..76c817b 100644 } static void errstack_free_X509(struct errstack_element_t *element) { -diff --git a/openssl_certs.c b/openssl_certs.c -index 021b573..a062a24 100644 --- a/openssl_certs.c +++ b/openssl_certs.c @@ -27,6 +27,7 @@ @@ -52,7 +48,7 @@ index 021b573..a062a24 100644 #include #include "ipfwd.h" -@@ -280,8 +281,8 @@ X509* openssl_create_certificate(const struct certificatespec_t *spec) { +@@ -280,8 +281,8 @@ X509* openssl_create_certificate(const s BN_free(serial); /* Set lifetime */ @@ -63,7 +59,7 @@ index 021b573..a062a24 100644 /* Set public key */ X509_set_pubkey(cert, spec->subject_pubkey); -@@ -357,8 +358,8 @@ X509* openssl_create_certificate(const struct certificatespec_t *spec) { +@@ -357,8 +358,8 @@ X509* openssl_create_certificate(const s return cert; } @@ -74,11 +70,9 @@ index 021b573..a062a24 100644 } X509* openssl_load_stored_certificate(const struct certificatespec_t *certspec, const char *filename, bool recreate_when_expired, bool recreate_when_key_mismatch) { -diff --git a/openssl_tls.c b/openssl_tls.c -index 4ba19a3..96a12ec 100644 --- a/openssl_tls.c +++ b/openssl_tls.c -@@ -146,11 +146,6 @@ struct tls_connection_t openssl_tls_connect(const struct tls_connection_request_ +@@ -146,11 +146,6 @@ struct tls_connection_t openssl_tls_conn SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, NULL); SSL_CTX_set_cert_verify_callback(sslctx, cert_verify_callback, &result); } @@ -90,6 +84,3 @@ index 4ba19a3..96a12ec 100644 if (request->config && request->config->cert) { if (SSL_CTX_use_certificate(sslctx, request->config->cert) != 1) { --- -2.20.1 - diff --git a/net/redsocks/patches/0006-fix_default_config_location.patch b/net/redsocks/patches/0006-fix_default_config_location.patch index 987085f0dd..cb0bdf9363 100644 --- a/net/redsocks/patches/0006-fix_default_config_location.patch +++ b/net/redsocks/patches/0006-fix_default_config_location.patch @@ -6,7 +6,7 @@ Forwared: no Last-Update: 2013-04-23 --- a/main.c +++ b/main.c -@@ -39,7 +39,7 @@ app_subsys *subsystems[] = { +@@ -45,7 +45,7 @@ app_subsys *subsystems[] = { &dnstc_subsys, }; diff --git a/net/rtorrent/patches/130-usleep.patch b/net/rtorrent/patches/130-usleep.patch index c3463e4be9..935429d377 100644 --- a/net/rtorrent/patches/130-usleep.patch +++ b/net/rtorrent/patches/130-usleep.patch @@ -9,8 +9,6 @@ uClibc-ng. src/thread_base.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/thread_base.cc b/src/thread_base.cc -index 081791d4..275015ab 100644 --- a/src/thread_base.cc +++ b/src/thread_base.cc @@ -42,6 +42,8 @@ @@ -22,7 +20,7 @@ index 081791d4..275015ab 100644 #include #include #include -@@ -66,7 +68,7 @@ class lt_cacheline_aligned thread_queue_hack { +@@ -66,7 +68,7 @@ public: thread_queue_hack() { std::memset(this, 0, sizeof(thread_queue_hack)); } diff --git a/net/samba4/patches/001-samba-4.4.0-pam.patch b/net/samba4/patches/001-samba-4.4.0-pam.patch index efd81f4d3e..f52e2efb25 100644 --- a/net/samba4/patches/001-samba-4.4.0-pam.patch +++ b/net/samba4/patches/001-samba-4.4.0-pam.patch @@ -1,6 +1,6 @@ --- a/source3/wscript +++ b/source3/wscript -@@ -843,7 +843,7 @@ msg.msg_accrightslen = sizeof(fd); +@@ -907,7 +907,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -9,7 +9,7 @@ use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -920,6 +920,17 @@ int i; i = PAM_RADIO_TYPE; +@@ -984,6 +984,17 @@ int i; i = PAM_RADIO_TYPE; "or headers not found. Use --without-pam to disable " "PAM support."); diff --git a/net/samba4/patches/003-getpwent_r.patch b/net/samba4/patches/003-getpwent_r.patch index 0ba5fcc537..4671aeae05 100644 --- a/net/samba4/patches/003-getpwent_r.patch +++ b/net/samba4/patches/003-getpwent_r.patch @@ -1,8 +1,6 @@ -diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..04f13c6 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c -@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, +@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu return true; } @@ -10,7 +8,7 @@ index 2cd6122..04f13c6 100644 static bool test_getgrgid(struct torture_context *tctx, gid_t gid, struct group *grp_p) -@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx, +@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort return true; } @@ -18,7 +16,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_passwd(struct torture_context *tctx, struct passwd **pwd_array_p, size_t *num_pwd_p) -@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx, +@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct to return true; } @@ -26,7 +24,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_passwd_equal(struct torture_context *tctx, const struct passwd *p1, -@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx) +@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture struct passwd *pwd, pwd1, pwd2; size_t num_pwd; @@ -35,7 +33,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx) +@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct t struct passwd *pwd, pwd1, pwd2, pwd3, pwd4; size_t num_pwd; @@ -44,7 +42,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx, +@@ -533,6 +534,7 @@ static bool test_enum_group(struct tortu return true; } @@ -52,7 +50,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_group(struct torture_context *tctx, struct group **grp_array_p, size_t *num_grp_p) -@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx, +@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct tor return true; } @@ -60,7 +58,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_group_equal(struct torture_context *tctx, const struct group *g1, -@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx) +@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_ struct group *grp, grp1, grp2; size_t num_grp; @@ -69,7 +67,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate group"); for (i=0; i < num_grp; i++) { -@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx) +@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct to struct group *grp, grp1, grp2, grp3, grp4; size_t num_grp; diff --git a/net/samba4/patches/004-missing-headers.patch b/net/samba4/patches/004-missing-headers.patch index 58c26aece6..5d294fcb8b 100644 --- a/net/samba4/patches/004-missing-headers.patch +++ b/net/samba4/patches/004-missing-headers.patch @@ -1,5 +1,3 @@ -diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h -index b5d79b9..3f4eae0 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -31,6 +31,7 @@ @@ -10,8 +8,6 @@ index b5d79b9..3f4eae0 100644 struct parmlist_entry { struct parmlist_entry *prev, *next; -diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c -index 3b1ac9c..4044d75 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -27,6 +27,8 @@ @@ -23,8 +19,6 @@ index 3b1ac9c..4044d75 100644 #ifndef HAVE_GETGROUPLIST -diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..0c84ec2 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c @@ -20,6 +20,8 @@ diff --git a/net/samba4/patches/005-musl_uintptr.patch b/net/samba4/patches/005-musl_uintptr.patch index de7f28572f..4437e9fea4 100644 --- a/net/samba4/patches/005-musl_uintptr.patch +++ b/net/samba4/patches/005-musl_uintptr.patch @@ -11,11 +11,9 @@ Date: Wed Mar 29 15:22:38 2017 -0300 Signed-off-by: Breno Leitao -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index 303d0ae..a2bfc40 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ @@ -24,7 +22,7 @@ index 303d0ae..a2bfc40 100644 # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t; -@@ -137,6 +137,8 @@ +@@ -137,6 +137,8 @@ typedef uintmax_t LargestIntegralType; # define _UINTPTR_T # define _UINTPTR_T_DEFINED diff --git a/net/samba4/patches/006-netdb-defines.patch b/net/samba4/patches/006-netdb-defines.patch index d7d6446abd..7cb073c150 100644 --- a/net/samba4/patches/006-netdb-defines.patch +++ b/net/samba4/patches/006-netdb-defines.patch @@ -1,8 +1,6 @@ -diff --git a/nsswitch/wins.c b/nsswitch/wins.c -index dccb6dd..bb24acb 100644 --- a/nsswitch/wins.c +++ b/nsswitch/wins.c -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = #define INADDRSZ 4 #endif diff --git a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch index c0e7e8907d..192cf564d4 100644 --- a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch +++ b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch @@ -13,8 +13,6 @@ Signed-off-by: Changqing Li lib/tevent/tevent.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h -index aa6fe0d..2572696 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -32,6 +32,8 @@ @@ -26,6 +24,3 @@ index aa6fe0d..2572696 100644 struct tevent_context; struct tevent_ops; --- -2.7.4 - diff --git a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch index 88c560d1ab..507b74c9cb 100644 --- a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch +++ b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch @@ -1,5 +1,5 @@ ---- a/wscript_configure_embedded_heimdal 2019-12-17 -+++ b/wscript_configure_embedded_heimdal 2019-12-17 +--- a/wscript_configure_embedded_heimdal ++++ b/wscript_configure_embedded_heimdal @@ -1 +1,12 @@ conf.RECURSE('source4/heimdal_build') + @@ -13,8 +13,8 @@ + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") ---- a/wscript_configure_system_heimdal 2019-12-17 -+++ b/wscript_configure_system_heimdal 2019-12-17 +--- a/wscript_configure_system_heimdal ++++ b/wscript_configure_system_heimdal @@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, funct conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True diff --git a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch index 1d19ec73c0..bbc66a0572 100644 --- a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch +++ b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch @@ -1,5 +1,5 @@ ---- a/lib/util/util_paths.c 2020-07-03 -+++ b/lib/util/util_paths.c 2020-07-03 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c @@ -26,6 +26,9 @@ #include "dynconfig/dynconfig.h" #include "lib/util/util_paths.h" diff --git a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch index dc647a7887..351f87bf72 100644 --- a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch +++ b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch @@ -1,5 +1,5 @@ ---- a/source3/lib/messages.c 2020-02-28 09:59:35.000000000 +0100 -+++ b/source3/lib/messages.c 2020-05-19 13:35:11.814566657 +0200 +--- a/source3/lib/messages.c ++++ b/source3/lib/messages.c @@ -507,7 +507,7 @@ static NTSTATUS messaging_init_internal( return NT_STATUS_ACCESS_DENIED; } diff --git a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch index 5271740011..d05e7bdccc 100644 --- a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch +++ b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch @@ -1,6 +1,6 @@ --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c -@@ -350,7 +350,7 @@ static struct imessaging_context *imessa +@@ -500,7 +500,7 @@ struct imessaging_context *imessaging_in goto fail; } diff --git a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch index 2b5bcdf578..39bbb77b78 100644 --- a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch +++ b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch @@ -4,7 +4,7 @@ Signed-off-by: Bian Naimeng --- a/lib/ldb/wscript +++ b/lib/ldb/wscript -@@ -152,7 +152,7 @@ def configure(conf): +@@ -143,7 +143,7 @@ def configure(conf): conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: @@ -15,7 +15,7 @@ Signed-off-by: Bian Naimeng if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): --- a/lib/talloc/wscript +++ b/lib/talloc/wscript -@@ -49,7 +49,7 @@ def configure(conf): +@@ -48,7 +48,7 @@ def configure(conf): conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' conf.env.TALLOC_VERSION = VERSION @@ -26,12 +26,12 @@ Signed-off-by: Bian Naimeng conf.CHECK_FUNCS('getauxval') --- a/lib/tdb/wscript +++ b/lib/tdb/wscript -@@ -89,7 +89,7 @@ def configure(conf): +@@ -95,7 +95,7 @@ def configure(conf): not conf.env.disable_tdb_mutex_locking): conf.define('USE_TDB_MUTEX_LOCKING', 1) - conf.CHECK_XSLTPROC_MANPAGES() + #conf.CHECK_XSLTPROC_MANPAGES() - if not conf.env.disable_python: - # also disable if we don't have the python libs installed + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() diff --git a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch index 1e2e11fcf2..8bb80897d4 100644 --- a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch +++ b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -340,22 +340,13 @@ def configure(conf): +@@ -416,22 +416,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -698,9 +689,6 @@ def configure(conf): +@@ -809,9 +800,6 @@ def configure(conf): # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,8 +39,8 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -713,7 +701,7 @@ def configure(conf): - #include "test/getifaddrs.c" +@@ -824,7 +812,7 @@ def configure(conf): + #include "tests/getifaddrs.c" ''' % method, method, - lib='nsl socket' + bsd_for_strlcpy, @@ -48,12 +48,11 @@ addmain=False, execute=True): break -@@ -761,7 +749,6 @@ def build(bld): +@@ -872,7 +860,6 @@ def build(bld): break extra_libs = '' - if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd' if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt' - - bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', - REPLACE_HOSTCC_SOURCE, + if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl' + diff --git a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch index 043b0a3b03..14a010c426 100644 --- a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch +++ b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch @@ -1,5 +1,5 @@ ---- a/lib/util/wscript_configure 2020-06-14 -+++ b/lib/util/wscript_configure 2020-06-14 +--- a/lib/util/wscript_configure ++++ b/lib/util/wscript_configure @@ -11,13 +11,13 @@ conf.CHECK_FUNCS_IN('backtrace backtrace conf.CHECK_HEADERS('execinfo.h') diff --git a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch index fcba206092..bceaa1addf 100644 --- a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch +++ b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch @@ -1,5 +1,5 @@ ---- a/lib/util/charset/wscript_configure 2020-06-14 -+++ b/lib/util/charset/wscript_configure 2020-06-14 +--- a/lib/util/charset/wscript_configure ++++ b/lib/util/charset/wscript_configure @@ -37,15 +37,15 @@ conf.CHECK_CODE(''' lib='iconv', headers='errno.h iconv.h') diff --git a/net/shorewall-core/patches/110-lib.common.patch b/net/shorewall-core/patches/110-lib.common.patch index 2391c0db21..8e79db3cfe 100644 --- a/net/shorewall-core/patches/110-lib.common.patch +++ b/net/shorewall-core/patches/110-lib.common.patch @@ -1,8 +1,6 @@ -Index: shorewall-core-5.2.4/lib.common -=================================================================== ---- shorewall-core-5.2.4.orig/lib.common 2020-03-25 22:16:13.640263032 +0100 -+++ shorewall-core-5.2.4/lib.common 2020-03-25 22:16:13.640263032 +0100 -@@ -347,7 +347,7 @@ +--- a/lib.common ++++ b/lib.common +@@ -347,7 +347,7 @@ reload_kernel_modules() { if [ -z "$MODULESDIR" ]; then uname=$(uname -r) @@ -11,7 +9,7 @@ Index: shorewall-core-5.2.4/lib.common if [ -n "$extras" ]; then for directory in $(split "$extras"); do MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory" -@@ -401,7 +401,7 @@ +@@ -401,7 +401,7 @@ load_kernel_modules() # $1 = Yes, if we if [ -z "$MODULESDIR" ]; then uname=$(uname -r) diff --git a/net/shorewall-lite/patches/010-install_cp.patch b/net/shorewall-lite/patches/010-install_cp.patch index 6e9e264d23..dac666d68c 100644 --- a/net/shorewall-lite/patches/010-install_cp.patch +++ b/net/shorewall-lite/patches/010-install_cp.patch @@ -1,8 +1,6 @@ -Index: shorewall-lite-5.2.1.2/install.sh -=================================================================== ---- shorewall-lite-5.2.1.2.orig/install.sh 2018-12-02 22:24:48.432796798 +0100 -+++ shorewall-lite-5.2.1.2/install.sh 2018-12-02 22:24:48.424797192 +0100 -@@ -500,7 +500,7 @@ +--- a/install.sh ++++ b/install.sh +@@ -500,7 +500,7 @@ ln -sf shorewall ${DESTDIR}${SBINDIR}/${ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755 diff --git a/net/shorewall-lite/patches/020-set-PATH.patch b/net/shorewall-lite/patches/020-set-PATH.patch index d800f2f676..90fab17f09 100644 --- a/net/shorewall-lite/patches/020-set-PATH.patch +++ b/net/shorewall-lite/patches/020-set-PATH.patch @@ -1,6 +1,6 @@ ---- shorewall-lite-5.1.9/shorewall-lite.conf.orig 2017-12-17 09:06:52.301331288 -0500 -+++ shorewall-lite-5.1.9/shorewall-lite.conf 2017-12-17 09:05:55.769714392 -0500 -@@ -36,7 +36,7 @@ +--- a/shorewall-lite.conf ++++ b/shorewall-lite.conf +@@ -36,7 +36,7 @@ LOGFILE= IPTABLES= diff --git a/net/shorewall-lite/patches/120-logfile.patch b/net/shorewall-lite/patches/120-logfile.patch index ff1c02e93f..19c53e1388 100644 --- a/net/shorewall-lite/patches/120-logfile.patch +++ b/net/shorewall-lite/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall-lite-5.1.7.2/shorewall-lite.conf -=================================================================== ---- shorewall-lite-5.1.7.2.orig/shorewall-lite.conf 2017-10-11 08:19:35.565847520 +0200 -+++ shorewall-lite-5.1.7.2/shorewall-lite.conf 2017-10-11 08:19:35.561847733 +0200 -@@ -28,7 +28,7 @@ +--- a/shorewall-lite.conf ++++ b/shorewall-lite.conf +@@ -28,7 +28,7 @@ VERBOSITY= # L O G G I N G ############################################################################### diff --git a/net/shorewall/patches/130-set-path.patch b/net/shorewall/patches/130-set-path.patch index e28aa399f2..b3448a0bab 100644 --- a/net/shorewall/patches/130-set-path.patch +++ b/net/shorewall/patches/130-set-path.patch @@ -1,8 +1,6 @@ -Index: shorewall-5.1.9/configfiles/shorewall.conf -=================================================================== ---- shorewall-5.1.9.orig/configfiles/shorewall.conf 2017-12-18 08:09:12.043625770 +0100 -+++ shorewall-5.1.9/configfiles/shorewall.conf 2017-12-18 08:09:54.353402257 +0100 -@@ -95,7 +95,7 @@ +--- a/configfiles/shorewall.conf ++++ b/configfiles/shorewall.conf +@@ -95,7 +95,7 @@ MODULESDIR= NFACCT= diff --git a/net/shorewall6-lite/patches/010-install_cp.patch b/net/shorewall6-lite/patches/010-install_cp.patch index 913be54370..dac666d68c 100644 --- a/net/shorewall6-lite/patches/010-install_cp.patch +++ b/net/shorewall6-lite/patches/010-install_cp.patch @@ -1,8 +1,6 @@ -Index: shorewall6-lite-5.2.1.2/install.sh -=================================================================== ---- shorewall6-lite-5.2.1.2.orig/install.sh 2018-12-02 22:31:46.628225916 +0100 -+++ shorewall6-lite-5.2.1.2/install.sh 2018-12-02 22:31:46.624226113 +0100 -@@ -500,7 +500,7 @@ +--- a/install.sh ++++ b/install.sh +@@ -500,7 +500,7 @@ ln -sf shorewall ${DESTDIR}${SBINDIR}/${ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755 diff --git a/net/shorewall6-lite/patches/020-set-PATH.patch b/net/shorewall6-lite/patches/020-set-PATH.patch index a75cc6905d..5ed8fe1f59 100644 --- a/net/shorewall6-lite/patches/020-set-PATH.patch +++ b/net/shorewall6-lite/patches/020-set-PATH.patch @@ -1,6 +1,6 @@ ---- shorewall6-lite-5.1.9/shorewall6-lite.conf.orig 2017-12-17 09:06:52.301331288 -0500 -+++ shorewall6-lite-5.1.9/shorewall6-lite.conf 2017-12-17 09:05:55.769714392 -0500 -@@ -36,7 +36,7 @@ +--- a/shorewall6-lite.conf ++++ b/shorewall6-lite.conf +@@ -36,7 +36,7 @@ LOGFILE= IP6TABLES= diff --git a/net/shorewall6-lite/patches/120-logfile.patch b/net/shorewall6-lite/patches/120-logfile.patch index 6afb39d2aa..68a0e9438a 100644 --- a/net/shorewall6-lite/patches/120-logfile.patch +++ b/net/shorewall6-lite/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall6-lite-5.1.10.2/shorewall6-lite.conf -=================================================================== ---- shorewall6-lite-5.1.10.2.orig/shorewall6-lite.conf 2018-01-04 22:09:34.461951267 +0100 -+++ shorewall6-lite-5.1.10.2/shorewall6-lite.conf 2018-01-04 22:10:23.559291269 +0100 -@@ -28,7 +28,7 @@ +--- a/shorewall6-lite.conf ++++ b/shorewall6-lite.conf +@@ -28,7 +28,7 @@ VERBOSITY= # L O G G I N G ############################################################################### diff --git a/net/shorewall6/patches/120-logfile.patch b/net/shorewall6/patches/120-logfile.patch index 1712e168d6..1db1d71078 100644 --- a/net/shorewall6/patches/120-logfile.patch +++ b/net/shorewall6/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf -=================================================================== ---- shorewall6-5.1.4.1.orig/configfiles/shorewall6.conf 2017-10-05 11:28:34.893849703 +0200 -+++ shorewall6-5.1.4.1/configfiles/shorewall6.conf 2017-10-05 11:29:13.047785350 +0200 -@@ -34,7 +34,7 @@ +--- a/configfiles/shorewall6.conf ++++ b/configfiles/shorewall6.conf +@@ -34,7 +34,7 @@ FIREWALL= # L O G G I N G ############################################################################### @@ -11,7 +9,7 @@ Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf BLACKLIST_LOG_LEVEL= -@@ -100,7 +100,7 @@ +@@ -100,7 +100,7 @@ RESTOREFILE=restore SHOREWALL_SHELL=/bin/sh diff --git a/net/shorewall6/patches/130-set-path.patch b/net/shorewall6/patches/130-set-path.patch index f420571b9e..d9ba88bb76 100644 --- a/net/shorewall6/patches/130-set-path.patch +++ b/net/shorewall6/patches/130-set-path.patch @@ -1,8 +1,6 @@ -Index: shorewall6-5.1.9/configfiles/shorewall6.conf -=================================================================== ---- shorewall6-5.1.9.orig/configfiles/shorewall6.conf 2017-12-18 08:13:01.999494346 +0100 -+++ shorewall6-5.1.9/configfiles/shorewall6.conf 2017-12-18 08:13:37.253618974 +0100 -@@ -94,7 +94,7 @@ +--- a/configfiles/shorewall6.conf ++++ b/configfiles/shorewall6.conf +@@ -94,7 +94,7 @@ NFACCT= PERL=/usr/bin/perl diff --git a/net/snort/patches/001-compile.patch b/net/snort/patches/001-compile.patch index 419051e93a..1a56e77f2d 100644 --- a/net/snort/patches/001-compile.patch +++ b/net/snort/patches/001-compile.patch @@ -1,7 +1,6 @@ -diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure.in ---- snort-2.9.11.1-vanilla/configure.in 2018-03-02 15:41:50.601809500 -0500 -+++ snort-2.9.11.1/configure.in 2018-03-02 16:19:08.119307772 -0500 -@@ -282,21 +282,7 @@ +--- a/configure.in ++++ b/configure.in +@@ -282,21 +282,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i AC_CHECK_TYPES([boolean]) # In case INADDR_NONE is not defined (like on Solaris) @@ -24,7 +23,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_inaddr_none) if test "x$have_inaddr_none" = "xno"; then AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) -@@ -428,17 +414,7 @@ +@@ -428,17 +414,7 @@ if test "x$LPCAP" = "xno"; then fi fi @@ -43,7 +42,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_pcap_lex_destroy) if test "x$have_pcap_lex_destroy" = "xyes"; then AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) -@@ -715,18 +691,7 @@ +@@ -716,18 +692,7 @@ fi AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc]) @@ -63,7 +62,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_real_addresses) if test "x$have_daq_real_addresses" = "xyes"; then AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1], -@@ -753,56 +718,21 @@ +@@ -770,56 +735,21 @@ if test "x$ac_cv_func_daq_dp_add_dc" = " fi @@ -123,7 +122,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_ext_modflow) if test "x$have_daq_ext_modflow" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW" -@@ -810,20 +740,7 @@ +@@ -827,20 +757,7 @@ if test "x$have_daq_ext_modflow" = "xyes [DAQ version supports extended flow modifiers.]) fi @@ -145,7 +144,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_queryflow) if test "x$have_daq_queryflow" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW" -@@ -831,17 +748,7 @@ +@@ -848,17 +765,7 @@ if test "x$have_daq_queryflow" = "xyes"; [DAQ version supports query flow.]) fi @@ -164,7 +163,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_data_channel_flags) if test "x$have_daq_data_channel_flags" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS" -@@ -849,18 +756,7 @@ +@@ -866,18 +773,7 @@ if test "x$have_daq_data_channel_flags" [DAQ version supports data channel.]) fi @@ -184,7 +183,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions) if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS" -@@ -869,35 +765,14 @@ +@@ -886,35 +782,14 @@ if test "x$have_daq_data_channel_separat fi AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) @@ -222,7 +221,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_packet_trace) if test "x$have_daq_packet_trace" = "xyes"; then AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], -@@ -906,18 +781,7 @@ +@@ -923,18 +798,7 @@ else echo "DAQ version doesn't support packet trace." fi diff --git a/net/snort/patches/003-include-tirpc.patch b/net/snort/patches/003-include-tirpc.patch index 439287dca9..16f0c1d0b0 100644 --- a/net/snort/patches/003-include-tirpc.patch +++ b/net/snort/patches/003-include-tirpc.patch @@ -1,6 +1,5 @@ -diff -u --recursive snort-2.9.15-vanilla/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c snort-2.9.15/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ---- snort-2.9.15-vanilla/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-10-03 02:42:31.000000000 -0400 -+++ snort-2.9.15/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-10-13 16:16:37.146329944 -0400 +--- a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ++++ b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c @@ -32,6 +32,7 @@ #include "flow.h" #include "service_api.h" diff --git a/net/socat/patches/100-usleep.patch b/net/socat/patches/100-usleep.patch index 305eaf25cd..cead181c1f 100644 --- a/net/socat/patches/100-usleep.patch +++ b/net/socat/patches/100-usleep.patch @@ -1,6 +1,6 @@ --- a/sycls.c +++ b/sycls.c -@@ -1329,6 +1329,7 @@ unsigned int Sleep(unsigned int seconds) { +@@ -1329,6 +1329,7 @@ unsigned int Sleep(unsigned int seconds) return retval; } diff --git a/net/socat/patches/200-openssl-deprecated.patch b/net/socat/patches/200-openssl-deprecated.patch index 07c9e5b0c5..a958284576 100644 --- a/net/socat/patches/200-openssl-deprecated.patch +++ b/net/socat/patches/200-openssl-deprecated.patch @@ -1,5 +1,3 @@ -diff --git a/xio-openssl.c b/xio-openssl.c -index e931983..84ec100 100644 --- a/xio-openssl.c +++ b/xio-openssl.c @@ -8,6 +8,8 @@ diff --git a/net/softethervpn/patches/110-no-m64.patch b/net/softethervpn/patches/110-no-m64.patch index ed21e14881..6ee75eca7e 100644 --- a/net/softethervpn/patches/110-no-m64.patch +++ b/net/softethervpn/patches/110-no-m64.patch @@ -1,6 +1,6 @@ --- a/src/makefiles/linux_64bit.mak +++ b/src/makefiles/linux_64bit.mak -@@ -66,9 +66,9 @@ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT +@@ -66,9 +66,9 @@ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG - OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz diff --git a/net/softethervpn/patches/120-openssl-deprecated.patch b/net/softethervpn/patches/120-openssl-deprecated.patch index 67bf97358c..e722fab980 100644 --- a/net/softethervpn/patches/120-openssl-deprecated.patch +++ b/net/softethervpn/patches/120-openssl-deprecated.patch @@ -16,7 +16,7 @@ #include #include #include -@@ -627,7 +629,7 @@ UINT CipherProcess(CIPHER *c, void *iv, void *dest, void *src, UINT size) +@@ -627,7 +629,7 @@ UINT CipherProcess(CIPHER *c, void *iv, return 0; } @@ -61,7 +61,7 @@ LOCK *lock = ssl_lock_obj[n]; if (mode & CRYPTO_LOCK) -@@ -972,12 +979,15 @@ void OpenSSL_Lock(int mode, int n, const char *file, int line) +@@ -972,12 +979,15 @@ void OpenSSL_Lock(int mode, int n, const // Unlock Unlock(lock); } @@ -77,7 +77,7 @@ } // Get the display name of the certificate -@@ -1901,8 +1911,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NAME *name, UINT days, X_SERIAL *serial) +@@ -1901,8 +1911,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NA X509_set_version(x509, 2L); // Set the Expiration @@ -88,7 +88,7 @@ if (!UINT64ToAsn1Time(t1, notBefore)) { FreeX509(x509); -@@ -2043,8 +2053,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME *name, UINT days, X_SERIAL *serial) +@@ -2043,8 +2053,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME X509_set_version(x509, 2L); // Set the Expiration @@ -218,7 +218,7 @@ --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c -@@ -18172,7 +18172,7 @@ struct ssl_ctx_st *NewSSLCtx(bool server_mode) +@@ -18172,7 +18172,7 @@ struct ssl_ctx_st *NewSSLCtx(bool server SSL_CTX_set_ecdh_auto(ctx, 1); #endif // SSL_CTX_set_ecdh_auto diff --git a/net/softethervpn/patches/130-iconv.patch b/net/softethervpn/patches/130-iconv.patch index b670a9e747..935216df4e 100644 --- a/net/softethervpn/patches/130-iconv.patch +++ b/net/softethervpn/patches/130-iconv.patch @@ -1,6 +1,6 @@ --- a/src/Mayaqua/Mayaqua.h +++ b/src/Mayaqua/Mayaqua.h -@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) +@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS #include #endif // MAYAQUA_SUPPORTS_GETIFADDRS @@ -11,7 +11,7 @@ size_t iconv (iconv_t __cd, char **__restrict __inbuf, --- a/src/makefiles/linux_32bit.mak +++ b/src/makefiles/linux_32bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lrea +@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char @@ -22,7 +22,7 @@ INSTALL_VPNSERVER_DIR=/usr/vpnserver/ --- a/src/makefiles/linux_64bit.mak +++ b/src/makefiles/linux_64bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto +@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char diff --git a/net/softethervpn5/patches/001-iconv-defines-fix.patch b/net/softethervpn5/patches/001-iconv-defines-fix.patch index 66173f99ab..88c8dc37c0 100644 --- a/net/softethervpn5/patches/001-iconv-defines-fix.patch +++ b/net/softethervpn5/patches/001-iconv-defines-fix.patch @@ -1,6 +1,6 @@ ---- a/src/Mayaqua/Mayaqua.h 2019-07-11 -+++ b/src/Mayaqua/Mayaqua.h 2019-07-11 -@@ -178,7 +178,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS +--- a/src/Mayaqua/Mayaqua.h ++++ b/src/Mayaqua/Mayaqua.h +@@ -184,7 +184,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS #include #endif // MAYAQUA_SUPPORTS_GETIFADDRS diff --git a/net/softethervpn5/patches/002-iconv-cmake-fix.patch b/net/softethervpn5/patches/002-iconv-cmake-fix.patch index 1f94c1abba..3683627e62 100644 --- a/net/softethervpn5/patches/002-iconv-cmake-fix.patch +++ b/net/softethervpn5/patches/002-iconv-cmake-fix.patch @@ -1,5 +1,5 @@ ---- a/src/Mayaqua/CMakeLists.txt 2019-07-10 -+++ b/src/Mayaqua/CMakeLists.txt 2019-07-11 +--- a/src/Mayaqua/CMakeLists.txt ++++ b/src/Mayaqua/CMakeLists.txt @@ -59,7 +59,7 @@ if(UNIX) find_package(ZLIB REQUIRED) diff --git a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch index 5ce814a7a1..9ceacb1b47 100644 --- a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch +++ b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch @@ -1,6 +1,6 @@ ---- a/src/Cedar/Server.h 2018-07-21 -+++ b/src/Cedar/Server.h 2018-07-23 -@@ -138,10 +138,10 @@ extern char *SERVER_CONFIG_FILE_NAME; +--- a/src/Cedar/Server.h ++++ b/src/Cedar/Server.h +@@ -32,10 +32,10 @@ extern char *SERVER_CONFIG_FILE_NAME; #define SERVER_CONTROL_TCP_TIMEOUT (60 * 1000) #define SERVER_FARM_CONTROL_INTERVAL (10 * 1000) diff --git a/net/softethervpn5/patches/101-add-config-write-syslog.patch b/net/softethervpn5/patches/101-add-config-write-syslog.patch index 8f2ede5f99..86b1ad2056 100644 --- a/net/softethervpn5/patches/101-add-config-write-syslog.patch +++ b/net/softethervpn5/patches/101-add-config-write-syslog.patch @@ -1,6 +1,6 @@ ---- a/src/Cedar/Server.c 2018-07-25 -+++ b/src/Cedar/Server.c 2018-07-26 -@@ -110,7 +110,7 @@ +--- a/src/Cedar/Server.c ++++ b/src/Cedar/Server.c +@@ -4,7 +4,7 @@ // Server.c // VPN Server module @@ -9,7 +9,7 @@ #include "CedarPch.h" static SERVER *server = NULL; -@@ -6601,6 +6601,10 @@ UINT SiWriteConfigurationFile(SERVER *s) +@@ -6492,6 +6492,10 @@ UINT SiWriteConfigurationFile(SERVER *s) { return 0; } diff --git a/net/softflowd/patches/010-bzero.patch b/net/softflowd/patches/010-bzero.patch index 8743a583d7..a67f6f34e6 100644 --- a/net/softflowd/patches/010-bzero.patch +++ b/net/softflowd/patches/010-bzero.patch @@ -1,6 +1,6 @@ --- a/freelist.c +++ b/freelist.c -@@ -46,7 +46,7 @@ freelist_init(struct freelist *fl, size_t allocsz) +@@ -46,7 +46,7 @@ freelist_init(struct freelist *fl, size_ { size_t sizeof_fl = sizeof(fl); FLOGIT((LOG_DEBUG, "%s: %s(%p, %zu)", __func__, __func__, fl, allocsz)); @@ -11,7 +11,7 @@ } --- a/ipfix.c +++ b/ipfix.c -@@ -388,7 +388,7 @@ ipfix_init_template_unity (struct FLOWTRACKPARAMETERS *param, +@@ -388,7 +388,7 @@ ipfix_init_template_unity (struct FLOWTR u_int8_t icmp_flag, u_int8_t bi_flag, u_int16_t version) { u_int index = 0, bi_index = 0, length = 0; @@ -20,7 +20,7 @@ template->h.c.set_id = htons (version == 10 ? IPFIX_TEMPLATE_SET_ID : NFLOW9_TEMPLATE_SET_ID); -@@ -510,7 +510,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -510,7 +510,7 @@ nflow9_init_option (u_int16_t ifidx, str NFLOW9_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS * sizeof (struct IPFIX_FIELD_SPECIFIER); @@ -29,7 +29,7 @@ option_template.h.c.set_id = htons (NFLOW9_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template.h) + scope_len + opt_len); -@@ -524,7 +524,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -524,7 +524,7 @@ nflow9_init_option (u_int16_t ifidx, str ipfix_init_fields (option_template.r, &option_index, field_nf9option, NFLOW9_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS); @@ -38,7 +38,7 @@ nf9opt_data.c.set_id = htons (IPFIX_SOFTFLOWD_OPTION_TEMPLATE_ID); nf9opt_data.c.length = htons (sizeof (nf9opt_data)); nf9opt_data.scope_ifidx = htonl (ifidx); -@@ -536,7 +536,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -536,7 +536,7 @@ nflow9_init_option (u_int16_t ifidx, str static void ipfix_init_option (struct timeval *system_boot_time, struct OPTION *option) { u_int scope_index = 0, option_index = 0; @@ -47,7 +47,7 @@ option_template.h.c.set_id = htons (IPFIX_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template)); option_template.h.u.i.r.template_id = -@@ -553,7 +553,7 @@ ipfix_init_option (struct timeval *system_boot_time, struct OPTION *option) { +@@ -553,7 +553,7 @@ ipfix_init_option (struct timeval *syste ipfix_init_fields (option_template.r, &option_index, field_option, IPFIX_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS); @@ -56,7 +56,7 @@ option_data.c.set_id = htons (IPFIX_SOFTFLOWD_OPTION_TEMPLATE_ID); option_data.c.length = htons (sizeof (option_data)); option_data.scope_pid = htonl ((u_int32_t) option->meteringProcessId); -@@ -809,7 +809,7 @@ send_ipfix_common (struct FLOW **flows, int num_flows, +@@ -809,7 +809,7 @@ send_ipfix_common (struct FLOW **flows, last_valid = num_packets = 0; for (j = 0; j < num_flows;) { @@ -94,7 +94,7 @@ option_template.h.c.flowset_id = htons (NFLOW9_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template)); option_template.h.template_id = htons (NF9_SOFTFLOWD_OPTION_TEMPLATE_ID); -@@ -238,7 +238,7 @@ nf9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -238,7 +238,7 @@ nf9_init_option (u_int16_t ifidx, struct option_template.r[1].length = htons (sizeof (option_data.sampling_algorithm)); @@ -103,7 +103,7 @@ option_data.c.flowset_id = htons (NF9_SOFTFLOWD_OPTION_TEMPLATE_ID); option_data.c.length = htons (sizeof (option_data)); option_data.scope_ifidx = htonl (ifidx); -@@ -257,7 +257,7 @@ nf_flow_to_flowset (const struct FLOW *flow, u_char * packet, u_int len, +@@ -257,7 +257,7 @@ nf_flow_to_flowset (const struct FLOW *f struct NF9_SOFTFLOWD_DATA_COMMON *dc[2]; u_int freclen, ret_len, nflows; @@ -112,7 +112,7 @@ *len_used = nflows = ret_len = 0; switch (flow->af) { case AF_INET: -@@ -363,7 +363,7 @@ send_netflow_v9 (struct SENDPARAMETER sp) { +@@ -363,7 +363,7 @@ send_netflow_v9 (struct SENDPARAMETER sp last_valid = num_packets = 0; for (j = 0; j < num_flows;) { @@ -123,7 +123,7 @@ nf9->version = htons (9); --- a/psamp.c +++ b/psamp.c -@@ -51,7 +51,7 @@ static int psamp_pkts_until_template = -1; +@@ -51,7 +51,7 @@ static int psamp_pkts_until_template = - static void psamp_init_template (struct PSAMP_SOFTFLOWD_TEMPLATE *template_p) { u_int index = 0; diff --git a/net/sslh/patches/001-no_sslh_select.patch b/net/sslh/patches/001-no_sslh_select.patch index 1d3b3feffd..fccceb6937 100644 --- a/net/sslh/patches/001-no_sslh_select.patch +++ b/net/sslh/patches/001-no_sslh_select.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS) +@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T version.h: ./genver.sh >version.h @@ -9,7 +9,7 @@ $(OBJS): version.h -@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h +@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) #strip sslh-fork diff --git a/net/sstp-client/patches/200-openssl-deprecated.patch b/net/sstp-client/patches/200-openssl-deprecated.patch index 9772c511fb..e2d4e3224e 100644 --- a/net/sstp-client/patches/200-openssl-deprecated.patch +++ b/net/sstp-client/patches/200-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/src/sstp-client.c +++ b/src/sstp-client.c -@@ -477,6 +477,7 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt) +@@ -477,6 +477,7 @@ static status_t sstp_init_ssl(sstp_clien int retval = SSTP_FAIL; int status = 0; @@ -8,7 +8,7 @@ /* Initialize the OpenSSL library */ status = SSL_library_init(); if (status != 1) -@@ -490,6 +491,9 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt) +@@ -490,6 +491,9 @@ static status_t sstp_init_ssl(sstp_clien /* Create a new crypto context */ client->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); diff --git a/net/stubby/patches/stubby-0.3.0-fix-config-install.patch b/net/stubby/patches/stubby-0.3.0-fix-config-install.patch index c873a50082..539012526d 100644 --- a/net/stubby/patches/stubby-0.3.0-fix-config-install.patch +++ b/net/stubby/patches/stubby-0.3.0-fix-config-install.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 2020-07-01 22:17:14.424445933 +0100 -+++ b/CMakeLists.txt 2020-07-01 22:17:57.032637638 +0100 -@@ -115,14 +115,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,14 +115,26 @@ install(FILES AUTHORS COPYING ChangeLog # Ensure the file gets CRLF line endings on Windows. file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/stubby.yml.example) diff --git a/net/sysrepo/patches/006-update-generated-protobufc-files.patch b/net/sysrepo/patches/006-update-generated-protobufc-files.patch index dbb4288e63..093fc41549 100644 --- a/net/sysrepo/patches/006-update-generated-protobufc-files.patch +++ b/net/sysrepo/patches/006-update-generated-protobufc-files.patch @@ -1,6 +1,6 @@ --- a/src/common/sysrepo.pb-c.c +++ b/src/common/sysrepo.pb-c.c -@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__event_notif_replay_resp__descriptor = +@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__eve (ProtobufCMessageInit) sr__event_notif_replay_resp__init, NULL,NULL,NULL /* reserved[123] */ }; @@ -9,7 +9,7 @@ { { "xpath", -@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[4] +@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, @@ -31,7 +31,7 @@ 3, /* field[3] = request_id */ 1, /* field[1] = subscriber_address */ 2, /* field[2] = subscription_id */ -@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_provide_req__number_ranges[3 + 1] = +@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_ { 1, 0 }, { 10, 1 }, { 20, 3 }, @@ -40,7 +40,7 @@ }; const ProtobufCMessageDescriptor sr__data_provide_req__descriptor = { -@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__data_provide_req__descriptor = +@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__dat "Sr__DataProvideReq", "sr", sizeof(Sr__DataProvideReq), diff --git a/net/tac_plus/patches/010-configure-remove-libnsl.patch b/net/tac_plus/patches/010-configure-remove-libnsl.patch index 01ac6aa558..4d5ad0c603 100644 --- a/net/tac_plus/patches/010-configure-remove-libnsl.patch +++ b/net/tac_plus/patches/010-configure-remove-libnsl.patch @@ -1,6 +1,6 @@ ---- a/tacacs-F4.0.4.28/configure 2015-01-06 22:55:35.000000000 +0100 -+++ b/tacacs-F4.0.4.28/configure 2019-01-31 14:44:28.679272504 +0100 -@@ -3285,11 +3285,9 @@ +--- a/tacacs-F4.0.4.28/configure ++++ b/tacacs-F4.0.4.28/configure +@@ -3244,11 +3244,9 @@ case "${host_os}" in ;; *linux* ) # XXX: not sure if /usr/local is necessary. diff --git a/net/tcpproxy/patches/001-ragel_generated.patch b/net/tcpproxy/patches/001-ragel_generated.patch index 600e602c21..70723e3e9a 100644 --- a/net/tcpproxy/patches/001-ragel_generated.patch +++ b/net/tcpproxy/patches/001-ragel_generated.patch @@ -1,6 +1,5 @@ -diff -Nur tcpproxy-1.2.orig/src/cfg_parser.c tcpproxy-1.2/src/cfg_parser.c ---- tcpproxy-1.2.orig/src/cfg_parser.c 1970-01-01 01:00:00.000000000 +0100 -+++ tcpproxy-1.2/src/cfg_parser.c 2015-05-17 18:10:54.933307372 +0200 +--- /dev/null ++++ b/src/cfg_parser.c @@ -0,0 +1,1374 @@ + +#line 1 "cfg_parser.rl" diff --git a/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch b/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch index 363ea27f65..e96d8a9f58 100644 --- a/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch +++ b/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch @@ -1,8 +1,6 @@ -Index: tcpproxy-1.2/src/configure -=================================================================== ---- tcpproxy-1.2.orig/src/configure 2017-12-03 13:12:34.483712208 +0100 -+++ tcpproxy-1.2/src/configure 2017-12-03 13:13:56.677386919 +0100 -@@ -195,9 +195,6 @@ +--- a/src/configure ++++ b/src/configure +@@ -195,9 +195,6 @@ if which git >/dev/null; then fi fi @@ -12,7 +10,7 @@ Index: tcpproxy-1.2/src/configure cat > config.h < config.h < -Index: udptunnel-1.1/host2ip.c -=================================================================== ---- udptunnel-1.1.orig/host2ip.c -+++ udptunnel-1.1/host2ip.c +--- a/host2ip.c ++++ b/host2ip.c @@ -4,7 +4,6 @@ #include /* gethostbyname() */ #include /* sockaddr_in */ @@ -33,10 +31,8 @@ Index: udptunnel-1.1/host2ip.c } return in; } /* host2ip */ -Index: udptunnel-1.1/udptunnel.c -=================================================================== ---- udptunnel-1.1.orig/udptunnel.c -+++ udptunnel-1.1/udptunnel.c +--- a/udptunnel.c ++++ b/udptunnel.c @@ -423,7 +423,7 @@ static void await_incoming_connections(s for (i = 0; i < relay_count; i++) { if (FD_ISSET(relays[i].tcp_listen_sock, &readfds)) { diff --git a/net/ulogd/patches/010-json-remote.patch b/net/ulogd/patches/010-json-remote.patch index a250e06312..e217a11d84 100644 --- a/net/ulogd/patches/010-json-remote.patch +++ b/net/ulogd/patches/010-json-remote.patch @@ -13,8 +13,6 @@ Signed-off-by: Pablo Neira Ayuso ulogd.conf.in | 11 ++ 2 files changed, 281 insertions(+), 21 deletions(-) -diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c -index 4d8e3e9..6edfa90 100644 --- a/output/ulogd_output_JSON.c +++ b/output/ulogd_output_JSON.c @@ -20,10 +20,15 @@ @@ -70,7 +68,7 @@ index 4d8e3e9..6edfa90 100644 JSON_CONF_MAX }; -@@ -95,15 +116,167 @@ static struct config_keyset json_kset = { +@@ -95,15 +116,167 @@ static struct config_keyset json_kset = .options = CONFIG_OPT_NONE, .u = { .value = 0 }, }, @@ -238,7 +236,7 @@ index 4d8e3e9..6edfa90 100644 json_t *msg; msg = json_object(); -@@ -218,34 +391,65 @@ static int json_interp(struct ulogd_pluginstance *upi) +@@ -218,34 +391,65 @@ static int json_interp(struct ulogd_plug } } @@ -320,7 +318,7 @@ index 4d8e3e9..6edfa90 100644 break; default: break; -@@ -255,6 +459,8 @@ static void sighup_handler_print(struct ulogd_pluginstance *upi, int signal) +@@ -255,6 +459,8 @@ static void sighup_handler_print(struct static int json_configure(struct ulogd_pluginstance *upi, struct ulogd_pluginstance_stack *stack) { @@ -329,7 +327,7 @@ index 4d8e3e9..6edfa90 100644 int ret; ret = ulogd_wildcard_inputkeys(upi); -@@ -265,13 +471,25 @@ static int json_configure(struct ulogd_pluginstance *upi, +@@ -265,13 +471,25 @@ static int json_configure(struct ulogd_p if (ret < 0) return ret; @@ -357,7 +355,7 @@ index 4d8e3e9..6edfa90 100644 op->of = fopen(upi->config_kset->ces[0].u.string, "a"); if (!op->of) { -@@ -280,6 +498,27 @@ static int json_init(struct ulogd_pluginstance *upi) +@@ -280,6 +498,27 @@ static int json_init(struct ulogd_plugin return -1; } @@ -385,7 +383,7 @@ index 4d8e3e9..6edfa90 100644 /* search for time */ op->sec_idx = -1; op->usec_idx = -1; -@@ -293,15 +532,25 @@ static int json_init(struct ulogd_pluginstance *upi) +@@ -293,15 +532,25 @@ static int json_init(struct ulogd_plugin *op->cached_tz = '\0'; @@ -414,8 +412,6 @@ index 4d8e3e9..6edfa90 100644 return 0; } -diff --git a/ulogd.conf.in b/ulogd.conf.in -index 62222db..99cfc24 100644 --- a/ulogd.conf.in +++ b/ulogd.conf.in @@ -213,6 +213,17 @@ sync=1 @@ -436,6 +432,3 @@ index 62222db..99cfc24 100644 [pcap1] #default file is /var/log/ulogd.pcap --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/020-fix-musl.patch b/net/ulogd/patches/020-fix-musl.patch index 592429a6dc..afbc64cf47 100644 --- a/net/ulogd/patches/020-fix-musl.patch +++ b/net/ulogd/patches/020-fix-musl.patch @@ -12,8 +12,6 @@ Signed-off-by: Pablo Neira Ayuso src/ulogd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/ulogd.c b/src/ulogd.c -index b8bc57c..9cd64e8 100644 --- a/src/ulogd.c +++ b/src/ulogd.c @@ -65,6 +65,7 @@ @@ -24,6 +22,3 @@ index b8bc57c..9cd64e8 100644 #include #include #ifdef DEBUG --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/030-ipfix-add.patch b/net/ulogd/patches/030-ipfix-add.patch index ec42c66e33..13d1472c92 100644 --- a/net/ulogd/patches/030-ipfix-add.patch +++ b/net/ulogd/patches/030-ipfix-add.patch @@ -68,11 +68,9 @@ Signed-off-by: Pablo Neira Ayuso create mode 100644 output/ipfix/ulogd_output_IPFIX.c delete mode 100644 output/ulogd_output_IPFIX.c -diff --git a/configure.ac b/configure.ac -index 3aa0624..48b4995 100644 --- a/configure.ac +++ b/configure.ac -@@ -179,7 +179,7 @@ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefi +@@ -179,7 +179,7 @@ AC_CONFIG_FILES(include/Makefile include input/sum/Makefile \ filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \ @@ -81,8 +79,6 @@ index 3aa0624..48b4995 100644 src/Makefile Makefile Rules.make) AC_OUTPUT -diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h -index 2e38195..1636a8c 100644 --- a/include/ulogd/ulogd.h +++ b/include/ulogd/ulogd.h @@ -28,6 +28,11 @@ @@ -97,11 +93,9 @@ index 2e38195..1636a8c 100644 #define ULOGD_RET_INT8 0x0001 #define ULOGD_RET_INT16 0x0002 -diff --git a/output/Makefile.am b/output/Makefile.am -index ff851ad..7ba8217 100644 --- a/output/Makefile.am +++ b/output/Makefile.am -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS} \ +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${ ${LIBNETFILTER_CONNTRACK_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} @@ -110,9 +104,6 @@ index ff851ad..7ba8217 100644 pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \ ulogd_output_OPRINT.la ulogd_output_GPRINT.la \ -diff --git a/output/ipfix/Makefile.am b/output/ipfix/Makefile.am -new file mode 100644 -index 0000000..cacda26 --- /dev/null +++ b/output/ipfix/Makefile.am @@ -0,0 +1,7 @@ @@ -123,9 +114,6 @@ index 0000000..cacda26 + +ulogd_output_IPFIX_la_SOURCES = ulogd_output_IPFIX.c ipfix.c +ulogd_output_IPFIX_la_LDFLAGS = -avoid-version -module -diff --git a/output/ipfix/ipfix.c b/output/ipfix/ipfix.c -new file mode 100644 -index 0000000..60a4c7f --- /dev/null +++ b/output/ipfix/ipfix.c @@ -0,0 +1,141 @@ @@ -270,9 +258,6 @@ index 0000000..60a4c7f + + return sizeof(struct vy_ipfix_data); +} -diff --git a/output/ipfix/ipfix.h b/output/ipfix/ipfix.h -new file mode 100644 -index 0000000..cdb5a6f --- /dev/null +++ b/output/ipfix/ipfix.h @@ -0,0 +1,89 @@ @@ -365,9 +350,6 @@ index 0000000..cdb5a6f +int ipfix_dump_msg(const struct ipfix_msg *); + +#endif /* IPFIX_H */ -diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c -new file mode 100644 -index 0000000..ec143b1 --- /dev/null +++ b/output/ipfix/ulogd_output_IPFIX.c @@ -0,0 +1,503 @@ @@ -874,6 +856,3 @@ index 0000000..ec143b1 +{ + ulogd_register_plugin(&ipfix_plugin); +} --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/040-ipfix-template.patch b/net/ulogd/patches/040-ipfix-template.patch index c6ac601bf8..c7b9d8eeb9 100644 --- a/net/ulogd/patches/040-ipfix-template.patch +++ b/net/ulogd/patches/040-ipfix-template.patch @@ -27,8 +27,6 @@ Signed-off-by: Pablo Neira Ayuso output/ipfix/ulogd_output_IPFIX.c | 56 ++++++++++++---------- 4 files changed, 139 insertions(+), 37 deletions(-) -diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h -index aef47f0..01dd96a 100644 --- a/include/ulogd/ipfix_protocol.h +++ b/include/ulogd/ipfix_protocol.h @@ -129,6 +129,7 @@ enum { @@ -39,8 +37,6 @@ index aef47f0..01dd96a 100644 IPFIX_bgpNextAdjacentAsNumber = 128, IPFIX_bgpPrevAdjacentAsNumber = 129, IPFIX_exporterIPv4Address = 130, -diff --git a/output/ipfix/ipfix.c b/output/ipfix/ipfix.c -index 60a4c7f..4bb432a 100644 --- a/output/ipfix/ipfix.c +++ b/output/ipfix/ipfix.c @@ -2,6 +2,7 @@ @@ -56,7 +52,8 @@ index 60a4c7f..4bb432a 100644 #include #include +#include -+ + +-struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid) +struct ipfix_templ_elem { + uint16_t id; + uint16_t len; @@ -113,8 +110,7 @@ index 60a4c7f..4bb432a 100644 + } + } +}; - --struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid) ++ +struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid, int tid) { struct ipfix_msg *msg; @@ -162,7 +158,7 @@ index 60a4c7f..4bb432a 100644 return msg; } -@@ -47,6 +130,14 @@ void ipfix_msg_free(struct ipfix_msg *msg) +@@ -47,6 +130,14 @@ void ipfix_msg_free(struct ipfix_msg *ms free(msg); } @@ -177,8 +173,6 @@ index 60a4c7f..4bb432a 100644 struct ipfix_hdr *ipfix_msg_hdr(const struct ipfix_msg *msg) { return (struct ipfix_hdr *)msg->data; -diff --git a/output/ipfix/ipfix.h b/output/ipfix/ipfix.h -index cdb5a6f..93945fb 100644 --- a/output/ipfix/ipfix.h +++ b/output/ipfix/ipfix.h @@ -2,6 +2,7 @@ @@ -257,8 +251,6 @@ index cdb5a6f..93945fb 100644 size_t ipfix_msg_len(const struct ipfix_msg *); void *ipfix_msg_data(struct ipfix_msg *); struct ipfix_set_hdr *ipfix_msg_add_set(struct ipfix_msg *, uint16_t); -diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c -index ec143b1..5b59003 100644 --- a/output/ipfix/ulogd_output_IPFIX.c +++ b/output/ipfix/ulogd_output_IPFIX.c @@ -3,6 +3,9 @@ @@ -313,7 +305,7 @@ index ec143b1..5b59003 100644 .ces = { { .key = "oid", -@@ -70,20 +74,21 @@ static const struct config_keyset ipfix_kset = { +@@ -70,20 +74,21 @@ static const struct config_keyset ipfix_ .key = "mtu", .type = CONFIG_TYPE_INT, .u.value = DEFAULT_MTU @@ -340,7 +332,7 @@ index ec143b1..5b59003 100644 int proto; struct ulogd_timer timer; struct sockaddr_in sa; -@@ -258,8 +263,8 @@ static void ipfix_timer_cb(struct ulogd_timer *t, void *data) +@@ -258,8 +263,8 @@ static void ipfix_timer_cb(struct ulogd_ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginstance_stack *stack) { struct ipfix_priv *priv = (struct ipfix_priv *) &pi->private; @@ -350,7 +342,7 @@ index ec143b1..5b59003 100644 char addr[16]; ret = config_parse_file(pi->id, pi->config_kset); -@@ -271,6 +276,7 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta +@@ -271,6 +276,7 @@ static int ipfix_configure(struct ulogd_ port = port_ce(pi->config_kset).u.value; proto = proto_ce(pi->config_kset).u.string; mtu = mtu_ce(pi->config_kset).u.value; @@ -358,7 +350,7 @@ index ec143b1..5b59003 100644 if (!oid) { ulogd_log(ULOGD_FATAL, "invalid Observation ID\n"); -@@ -303,6 +309,8 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta +@@ -303,6 +309,8 @@ static int ipfix_configure(struct ulogd_ ulogd_init_timer(&priv->timer, pi, ipfix_timer_cb); @@ -367,7 +359,7 @@ index ec143b1..5b59003 100644 ulogd_log(ULOGD_INFO, "using IPFIX Collector at %s:%d (MTU %d)\n", inet_ntop(AF_INET, &priv->sa.sin_addr, addr, sizeof(addr)), port, mtu); -@@ -410,25 +418,30 @@ static int ipfix_stop(struct ulogd_pluginstance *pi) +@@ -410,25 +418,30 @@ static int ipfix_stop(struct ulogd_plugi static int ipfix_interp(struct ulogd_pluginstance *pi) { struct ipfix_priv *priv = (struct ipfix_priv *) &pi->private; @@ -427,6 +419,3 @@ index ec143b1..5b59003 100644 if ((ret = send_msgs(pi)) < 0) return ret; --- -cgit v1.2.1 - diff --git a/net/unbound/patches/100-example-conf-in.patch b/net/unbound/patches/100-example-conf-in.patch index 0a4b61104b..e73f7b0baf 100644 --- a/net/unbound/patches/100-example-conf-in.patch +++ b/net/unbound/patches/100-example-conf-in.patch @@ -3,14 +3,12 @@ Patch the default configuration file with the tiny memory configuration example from Unbound documentation. This is the best starting point for embedded routers if one is not going to use UCI. -Index: doc/example.conf.in -=================================================================== --- a/doc/example.conf.in +++ b/doc/example.conf.in -@@ -15,6 +15,76 @@ server: +@@ -19,6 +19,76 @@ server: # verbosity number, 0 is least verbose. 1 is default. verbosity: 1 - + + ############################################################################ + # MEMORY CONTROL EXAMPLE + # In the example config settings below memory usage is reduced. Some ser- diff --git a/net/uwsgi/patches/001-dont-hardcode-zlib.patch b/net/uwsgi/patches/001-dont-hardcode-zlib.patch index 23ca62d5d0..df007ce065 100644 --- a/net/uwsgi/patches/001-dont-hardcode-zlib.patch +++ b/net/uwsgi/patches/001-dont-hardcode-zlib.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -851,11 +851,11 @@ class uConf(object): +@@ -856,11 +856,11 @@ class uConf(object): self.cflags.append('-DUWSGI_HAS_EXECINFO') report['execinfo'] = True diff --git a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch index 196edfbdb9..ff8de5df98 100644 --- a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch +++ b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -680,7 +680,7 @@ class uConf(object): +@@ -685,7 +685,7 @@ class uConf(object): self.include_path += os.environ['UWSGI_INCLUDES'].split(',') diff --git a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch index 169a309f8f..6f496ef0d3 100644 --- a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch +++ b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -5,9 +5,9 @@ +@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1' import os import re import time diff --git a/net/uwsgi/patches/010-uclibc-ng.patch b/net/uwsgi/patches/010-uclibc-ng.patch index e967320d95..e12c3c5148 100644 --- a/net/uwsgi/patches/010-uclibc-ng.patch +++ b/net/uwsgi/patches/010-uclibc-ng.patch @@ -1,6 +1,6 @@ --- a/core/uwsgi.c +++ b/core/uwsgi.c -@@ -1820,7 +1820,7 @@ void uwsgi_plugins_atexit(void) { +@@ -1822,7 +1822,7 @@ void uwsgi_plugins_atexit(void) { void uwsgi_backtrace(int depth) { diff --git a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch index 82522be19a..7c73892690 100644 --- a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch +++ b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch @@ -1,7 +1,5 @@ -Index: uwsgi-2.0.18/Makefile -=================================================================== ---- uwsgi-2.0.18.orig/Makefile -+++ uwsgi-2.0.18/Makefile +--- a/Makefile ++++ b/Makefile @@ -1,4 +1,4 @@ -PYTHON := python +PYTHON ?= python3 diff --git a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch index 7acdfc71c5..cd45721235 100644 --- a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch +++ b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch @@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith plugins/cgi/cgi_plugin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -diff --git a/plugins/cgi/cgi_plugin.c b/plugins/cgi/cgi_plugin.c -index d032db17c..30e1cc528 100644 --- a/plugins/cgi/cgi_plugin.c +++ b/plugins/cgi/cgi_plugin.c @@ -15,6 +15,7 @@ struct uwsgi_cgi { @@ -23,7 +21,7 @@ index d032db17c..30e1cc528 100644 int from_docroot; int has_mountpoints; struct uwsgi_dyn_dict *default_cgi; -@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[] = { +@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[] {"cgi-safe", required_argument, 0, "skip security checks if the cgi file is under the specified path", uwsgi_opt_add_string_list, &uc.cgi_safe, 0}, @@ -32,7 +30,7 @@ index d032db17c..30e1cc528 100644 {0, 0, 0, 0, 0, 0, 0}, }; -@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi char full_path[PATH_MAX]; char tmp_path[PATH_MAX]; @@ -40,7 +38,7 @@ index d032db17c..30e1cc528 100644 struct stat cgi_stat; int need_free = 0; int is_a_file = 0; -@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi uwsgi_404(wsgi_req); return UWSGI_OK; } @@ -51,7 +49,7 @@ index d032db17c..30e1cc528 100644 full_path_len = strlen(tmp_path); // add +1 to copy the null byte -@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi } } diff --git a/net/vncrepeater/patches/001-uclibcxx_linking.patch b/net/vncrepeater/patches/001-uclibcxx_linking.patch index eca2c3af4e..1fef93cdd7 100644 --- a/net/vncrepeater/patches/001-uclibcxx_linking.patch +++ b/net/vncrepeater/patches/001-uclibcxx_linking.patch @@ -1,5 +1,5 @@ ---- vncrepeater-0.14/Makefile 2006-04-09 23:37:10.000000000 +0200 -+++ vncrepeater-0.14.new/Makefile 2016-11-09 19:59:13.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,27 +1,28 @@ CFLAGS=-Wall repeater: repeater.o repeaterproc.o openbsd_stringfuncs.o iniparser.o readini.o repeaterutil.o repeaterevents.o diff --git a/net/vncrepeater/patches/002-cfg-path.patch b/net/vncrepeater/patches/002-cfg-path.patch index 976504ba61..85a92c8f01 100644 --- a/net/vncrepeater/patches/002-cfg-path.patch +++ b/net/vncrepeater/patches/002-cfg-path.patch @@ -1,6 +1,6 @@ ---- vncrepeater-0.14/repeater.cpp 2006-10-20 17:07:50.000000000 +0200 -+++ vncrepeater-0.14.new/repeater.cpp 2016-11-19 17:04:59.907871000 +0100 -@@ -593,7 +593,9 @@ +--- a/repeater.cpp ++++ b/repeater.cpp +@@ -593,7 +593,9 @@ static bool checkIdCode(char *IdCode) static long parseId(char *IdCode) { unsigned int ii; @@ -11,7 +11,7 @@ debug(LEVEL_3, "parseId(): IdCode = %s\n", IdCode); -@@ -998,9 +1000,13 @@ +@@ -998,9 +1000,13 @@ static bool isServerAddressAllowed(char allow = false; //server 0 == denied @@ -27,7 +27,7 @@ //allowed so far ? if (allow) -@@ -1983,7 +1989,7 @@ +@@ -1983,7 +1989,7 @@ int main(int argc, char **argv) struct sigaction saInt; //ini file default diff --git a/net/vnstat/patches/990-adjust-configuration-defaults.patch b/net/vnstat/patches/990-adjust-configuration-defaults.patch index 1627b4d726..ca11ff83aa 100644 --- a/net/vnstat/patches/990-adjust-configuration-defaults.patch +++ b/net/vnstat/patches/990-adjust-configuration-defaults.patch @@ -9,8 +9,8 @@ Signed-off-by: Jo-Philipp Wich --- a/cfg/vnstat.conf +++ b/cfg/vnstat.conf -@@ -87,13 +87,13 @@ DaemonUser "" - DaemonGroup "" +@@ -98,13 +98,13 @@ DaemonGroup "" + TimeSyncWait 5 # how often (in seconds) interface data is updated -UpdateInterval 30 diff --git a/net/vpnc/patches/110-openssl-deprecated.patch b/net/vpnc/patches/110-openssl-deprecated.patch index 1c10bb8922..bd7c2fa268 100644 --- a/net/vpnc/patches/110-openssl-deprecated.patch +++ b/net/vpnc/patches/110-openssl-deprecated.patch @@ -8,7 +8,7 @@ #include "config.h" #include "sysdep.h" #include "crypto.h" -@@ -35,10 +36,12 @@ crypto_ctx *crypto_ctx_new(crypto_error **error) +@@ -35,10 +36,12 @@ crypto_ctx *crypto_ctx_new(crypto_error return NULL; } diff --git a/net/vsftpd/patches/010-openssl-deprecated.patch b/net/vsftpd/patches/010-openssl-deprecated.patch index bbbfbe8e77..0db80b975d 100644 --- a/net/vsftpd/patches/010-openssl-deprecated.patch +++ b/net/vsftpd/patches/010-openssl-deprecated.patch @@ -8,8 +8,6 @@ Signed-off-by: Rosen Penev ssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/ssl.c b/ssl.c -index c362983..845f77b 100644 --- a/ssl.c +++ b/ssl.c @@ -28,6 +28,9 @@ @@ -51,7 +49,7 @@ index c362983..845f77b 100644 if (tunable_ssl_request_cert) { verify_option |= SSL_VERIFY_PEER; -@@ -660,7 +669,9 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_session* p_sess, struct mystr* p_str) +@@ -660,7 +669,9 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_s static char* get_ssl_error() { @@ -61,6 +59,3 @@ index c362983..845f77b 100644 return ERR_error_string(ERR_get_error(), NULL); } --- -2.19.1 - diff --git a/net/wifidog/patches/010-use-tls-above-1.patch b/net/wifidog/patches/010-use-tls-above-1.patch index ba397506a7..71273a9833 100644 --- a/net/wifidog/patches/010-use-tls-above-1.patch +++ b/net/wifidog/patches/010-use-tls-above-1.patch @@ -1,5 +1,3 @@ -diff --git a/configure.in b/configure.in -index bf5463a..43ec27c 100644 --- a/configure.in +++ b/configure.in @@ -96,8 +96,8 @@ if test "x$enable_cyassl" = xyes; then @@ -22,8 +20,6 @@ index bf5463a..43ec27c 100644 CyaSSL_CTX_UseSNI(ctx, CYASSL_SNI_HOST_NAME, "wifidog.org", 11); ]])], [enabled_sni=yes], [enabled_sni=no]) -diff --git a/src/simple_http.c b/src/simple_http.c -index f0e27ee..7271021 100644 --- a/src/simple_http.c +++ b/src/simple_http.c @@ -162,8 +162,7 @@ get_cyassl_ctx(const char *hostname) diff --git a/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch b/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch index a1afe597ab..9a13ba1441 100644 --- a/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch +++ b/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch @@ -7,8 +7,6 @@ This used to use a RAW socket, while now it used a DGRAM socket. Previously it failed with operation not permitted, while this version seems to work reliably. -diff --git a/src/util.c b/src/util.c -index 46ec5a2..426ba13 100644 --- a/src/util.c +++ b/src/util.c @@ -174,11 +174,13 @@ get_iface_ip(const char *ifname) diff --git a/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch b/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch index 6475272df6..0ee0376f2a 100644 --- a/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch +++ b/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch @@ -10,8 +10,6 @@ Fixes 90884c62 ("xl2tpd-control refactoring") xl2tpd-control.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/xl2tpd-control.c b/xl2tpd-control.c -index 1e87c93..d1df0f6 100644 --- a/xl2tpd-control.c +++ b/xl2tpd-control.c @@ -83,7 +83,8 @@ struct command_t commands[] = { diff --git a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch b/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch index ae5dc06494..200688e9b5 100644 --- a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch +++ b/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch @@ -7,8 +7,6 @@ Subject: [PATCH] xl2tpd-control: fix typo in usage xl2tpd-control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xl2tpd-control.c b/xl2tpd-control.c -index d1df0f6..2e683c8 100644 --- a/xl2tpd-control.c +++ b/xl2tpd-control.c @@ -96,7 +96,7 @@ void usage() diff --git a/net/xl2tpd/patches/0003-Skip-building-pfc.patch b/net/xl2tpd/patches/0003-Skip-building-pfc.patch index ed40d43306..4ec98f38a8 100644 --- a/net/xl2tpd/patches/0003-Skip-building-pfc.patch +++ b/net/xl2tpd/patches/0003-Skip-building-pfc.patch @@ -10,8 +10,6 @@ It can cause build failure, see [1] Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -diff --git a/Makefile b/Makefile -index 9927715..8a3eecd 100644 --- a/Makefile +++ b/Makefile @@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin diff --git a/net/xtables-addons/patches/210-freebsd-build-fix.patch b/net/xtables-addons/patches/210-freebsd-build-fix.patch index d5bc16d60c..4f05d60eb8 100644 --- a/net/xtables-addons/patches/210-freebsd-build-fix.patch +++ b/net/xtables-addons/patches/210-freebsd-build-fix.patch @@ -1,6 +1,6 @@ --- a/extensions/LUA/Makefile +++ b/extensions/LUA/Makefile -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ PKG_CONFIG = /usr/bin/pkg-config RANLIB = ranlib SED = /bin/sed SET_MAKE = diff --git a/sound/espeak/patches/010-uclibcxx.patch b/sound/espeak/patches/010-uclibcxx.patch index f4d2f9a3a6..127df39992 100644 --- a/sound/espeak/patches/010-uclibcxx.patch +++ b/sound/espeak/patches/010-uclibcxx.patch @@ -1,6 +1,6 @@ --- a/src/Makefile +++ b/src/Makefile -@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp +@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compil SRCS1=$(speak_SOURCES) OBJS1=$(patsubst %.cpp,%.o,$(SRCS1)) diff --git a/sound/madplay/patches/0001-switch-to-new-alsa-api.patch b/sound/madplay/patches/0001-switch-to-new-alsa-api.patch index 60d7bd3799..d043818b08 100644 --- a/sound/madplay/patches/0001-switch-to-new-alsa-api.patch +++ b/sound/madplay/patches/0001-switch-to-new-alsa-api.patch @@ -2,24 +2,24 @@ Switch madplay to the new API. This is done thanks to a patch written by Micha Nelissen and available at http://article.gmane.org/gmane.comp.audio.mad.devel/729. ---- madplay-0.15.2b/audio_alsa.c 2008-10-18 15:10:16.000000000 +0200 -+++ madplay-0.15.2b/audio_alsa.c.new 2008-10-18 15:03:27.000000000 +0200 +--- a/audio_alsa.c ++++ b/audio_alsa.c @@ -28,31 +28,30 @@ - + #include - + -#define ALSA_PCM_OLD_HW_PARAMS_API -#define ALSA_PCM_OLD_SW_PARAMS_API #include - + #include - + #include "audio.h" - + -char *buf = NULL; -int paused = 0; +#define BUFFER_TIME_MAX 500000 - + -int rate = -1; -int channels = -1; -int bitdepth = -1; @@ -39,17 +39,17 @@ http://article.gmane.org/gmane.comp.audio.mad.devel/729. +unsigned int buffer_time; +unsigned int period_time; +char *defaultdev = "plughw:0,0"; - + snd_pcm_hw_params_t *alsa_hwparams; snd_pcm_sw_params_t *alsa_swparams; - + -snd_pcm_sframes_t buffer_size; -snd_pcm_sframes_t period_size; +snd_pcm_uframes_t buffer_size; - + snd_pcm_format_t alsa_format = -1; snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED; -@@ -66,14 +65,20 @@ +@@ -66,14 +65,20 @@ int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, snd_pcm_access_t access) { @@ -72,7 +72,7 @@ http://article.gmane.org/gmane.comp.audio.mad.devel/729. /* set the sample format */ err = snd_pcm_hw_params_set_format(handle, params, alsa_format); if (err < 0) { -@@ -87,29 +92,38 @@ +@@ -87,29 +92,38 @@ int set_hwparams(snd_pcm_t *handle, return err; } /* set the stream rate */ @@ -120,15 +120,15 @@ http://article.gmane.org/gmane.comp.audio.mad.devel/729. /* write the parameters to device */ err = snd_pcm_hw_params(handle, params); if (err < 0) { -@@ -123,6 +137,7 @@ +@@ -123,6 +137,7 @@ static int set_swparams(snd_pcm_t *handle, snd_pcm_sw_params_t *params) { + unsigned int start_threshold; int err; - + /* get current swparams */ -@@ -136,13 +151,7 @@ +@@ -136,13 +151,7 @@ int set_swparams(snd_pcm_t *handle, if (err < 0) { printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err)); return err; @@ -143,31 +143,30 @@ http://article.gmane.org/gmane.comp.audio.mad.devel/729. /* align all transfers to 1 samples */ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1); if (err < 0) { -@@ -190,7 +199,7 @@ +@@ -190,7 +199,7 @@ int config(struct audio_config *config) rate = config->speed; - + if ( bitdepth == 0 ) - config->precision = bitdepth = 32; + config->precision = bitdepth = 16; - + switch (bitdepth) { -@@ -241,7 +250,7 @@ +@@ -241,7 +250,7 @@ int config(struct audio_config *config) return -1; } - + - buf = malloc(buffer_size); + buf = malloc(buffer_size * sample_size); if (buf == NULL) { audio_error="unable to allocate output buffer table"; return -1; -@@ -279,7 +288,7 @@ +@@ -279,7 +288,7 @@ static int play(struct audio_play *play) { int err, len; - char *ptr; + unsigned char *ptr; - + ptr = buf; len = play->nsamples; - diff --git a/sound/mpd/patches/010-iconv.patch b/sound/mpd/patches/010-iconv.patch index d589db30e1..c1f1ffccad 100644 --- a/sound/mpd/patches/010-iconv.patch +++ b/sound/mpd/patches/010-iconv.patch @@ -16,8 +16,6 @@ Signed-off-by: Rosen Penev src/lib/icu/meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build -index bd6e30944..e63d614a0 100644 --- a/src/lib/icu/meson.build +++ b/src/lib/icu/meson.build @@ -18,8 +18,18 @@ if icu_dep.found() diff --git a/sound/mpd/patches/020-npupnp.patch b/sound/mpd/patches/020-npupnp.patch index 02d255673a..dbe21e0941 100644 --- a/sound/mpd/patches/020-npupnp.patch +++ b/sound/mpd/patches/020-npupnp.patch @@ -18,11 +18,9 @@ Subject: [PATCH] Modification to use npupnp instead of pupnp when the upnp src/lib/upnp/meson.build | 20 +++- 11 files changed, 170 insertions(+), 11 deletions(-) -diff --git a/meson_options.txt b/meson_options.txt -index d17ac1ca8..da90ccfd8 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -54,7 +54,10 @@ option('dsd', type: 'boolean', value: true, description: 'Support the DSD audio +@@ -54,7 +54,10 @@ option('dsd', type: 'boolean', value: tr # option('database', type: 'boolean', value: true, description: 'enable support for the music database') @@ -34,8 +32,6 @@ index d17ac1ca8..da90ccfd8 100644 option('libmpdclient', type: 'feature', description: 'libmpdclient support (for the proxy database plugin)') # -diff --git a/src/db/plugins/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx -index 99893d89d..29d58ca23 100644 --- a/src/db/plugins/upnp/ContentDirectoryService.cxx +++ b/src/db/plugins/upnp/ContentDirectoryService.cxx @@ -18,7 +18,10 @@ @@ -61,7 +57,7 @@ index 99893d89d..29d58ca23 100644 static void ReadResultTag(UPnPDirContent &dirbuf, IXML_Document *response) { -@@ -39,6 +45,7 @@ ReadResultTag(UPnPDirContent &dirbuf, IXML_Document *response) +@@ -39,6 +45,7 @@ ReadResultTag(UPnPDirContent &dirbuf, IX dirbuf.Parse(p); } @@ -69,7 +65,7 @@ index 99893d89d..29d58ca23 100644 inline void ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl, -@@ -47,6 +54,7 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl, +@@ -47,6 +54,7 @@ ContentDirectoryService::readDirSlice(Up unsigned &didreadp, unsigned &totalp) const { @@ -77,7 +73,7 @@ index 99893d89d..29d58ca23 100644 // Some devices require an empty SortCriteria, else bad params IXML_Document *request = MakeActionHelper("Browse", m_serviceType.c_str(), -@@ -82,6 +90,37 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl, +@@ -82,6 +90,37 @@ ContentDirectoryService::readDirSlice(Up totalp = ParseUnsigned(value); ReadResultTag(dirbuf, response); @@ -115,7 +111,7 @@ index 99893d89d..29d58ca23 100644 } UPnPDirContent -@@ -110,6 +149,7 @@ ContentDirectoryService::search(UpnpClient_Handle hdl, +@@ -110,6 +149,7 @@ ContentDirectoryService::search(UpnpClie unsigned offset = 0, total = -1, count; do { @@ -123,7 +119,7 @@ index 99893d89d..29d58ca23 100644 UniqueIxmlDocument request(MakeActionHelper("Search", m_serviceType.c_str(), "ContainerID", objectId, "SearchCriteria", ss, -@@ -147,6 +187,39 @@ ContentDirectoryService::search(UpnpClient_Handle hdl, +@@ -147,6 +187,39 @@ ContentDirectoryService::search(UpnpClie total = ParseUnsigned(value); ReadResultTag(dirbuf, response.get()); @@ -171,7 +167,7 @@ index 99893d89d..29d58ca23 100644 // Create request UniqueIxmlDocument request(MakeActionHelper("Browse", m_serviceType.c_str(), "ObjectID", objectId, -@@ -179,4 +253,31 @@ ContentDirectoryService::getMetadata(UpnpClient_Handle hdl, +@@ -179,4 +253,31 @@ ContentDirectoryService::getMetadata(Upn UPnPDirContent dirbuf; ReadResultTag(dirbuf, response.get()); return dirbuf; @@ -203,11 +199,9 @@ index 99893d89d..29d58ca23 100644 + return dirbuf; +#endif } -diff --git a/src/lib/upnp/Action.hxx b/src/lib/upnp/Action.hxx -index 49ed75198..4ecf4cb06 100644 --- a/src/lib/upnp/Action.hxx +++ b/src/lib/upnp/Action.hxx -@@ -38,6 +38,7 @@ CountNameValuePairs(gcc_unused const char *name, gcc_unused const char *value, +@@ -38,6 +38,7 @@ CountNameValuePairs(gcc_unused const cha return 1 + CountNameValuePairs(args...); } @@ -215,15 +209,13 @@ index 49ed75198..4ecf4cb06 100644 /** * A wrapper for UpnpMakeAction() that counts the number of name/value * pairs and adds the nullptr sentinel. -@@ -52,5 +53,6 @@ MakeActionHelper(const char *action_name, const char *service_type, +@@ -52,5 +53,6 @@ MakeActionHelper(const char *action_name args..., nullptr, nullptr); } +#endif #endif -diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx -index 23ba9cade..54b677fa2 100644 --- a/src/lib/upnp/ClientInit.cxx +++ b/src/lib/upnp/ClientInit.cxx @@ -31,14 +31,12 @@ static Mutex upnp_client_init_mutex; @@ -246,8 +238,6 @@ index 23ba9cade..54b677fa2 100644 if (cookie == nullptr) /* this is the cookie passed to UpnpRegisterClient(); but can this ever happen? Will libupnp ever invoke -diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx -index 7fba1d83b..b9a4d7cf3 100644 --- a/src/lib/upnp/Compat.hxx +++ b/src/lib/upnp/Compat.hxx @@ -22,14 +22,14 @@ @@ -267,8 +257,6 @@ index 7fba1d83b..b9a4d7cf3 100644 #include "util/Compiler.h" gcc_pure -diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx -index ae514c717..eed28b41a 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -17,15 +17,21 @@ @@ -293,7 +281,7 @@ index ae514c717..eed28b41a 100644 ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device, const UPnPService &service) noexcept :m_actionURL(uri_apply_base(service.controlURL, device.URLBase)), -@@ -51,6 +57,7 @@ ContentDirectoryService::~ContentDirectoryService() noexcept +@@ -51,6 +57,7 @@ ContentDirectoryService::~ContentDirecto std::forward_list ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const { @@ -301,7 +289,7 @@ index ae514c717..eed28b41a 100644 UniqueIxmlDocument request(UpnpMakeAction("GetSearchCapabilities", m_serviceType.c_str(), 0, nullptr, nullptr)); -@@ -69,6 +76,24 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const +@@ -69,6 +76,24 @@ ContentDirectoryService::getSearchCapabi const char *s = ixmlwrap::getFirstElementValue(response.get(), "SearchCaps"); @@ -326,8 +314,6 @@ index ae514c717..eed28b41a 100644 if (s == nullptr || *s == 0) /* we could just "return {}" here, but GCC 5 doesn't understand that */ -diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx -index 7ad4d565a..10510402a 100644 --- a/src/lib/upnp/Init.cxx +++ b/src/lib/upnp/Init.cxx @@ -23,7 +23,9 @@ @@ -351,8 +337,6 @@ index 7ad4d565a..10510402a 100644 } void -diff --git a/src/lib/upnp/UniqueIxml.hxx b/src/lib/upnp/UniqueIxml.hxx -index 2ff2afa62..8a0ea0a1f 100644 --- a/src/lib/upnp/UniqueIxml.hxx +++ b/src/lib/upnp/UniqueIxml.hxx @@ -20,6 +20,7 @@ @@ -369,8 +353,6 @@ index 2ff2afa62..8a0ea0a1f 100644 +#endif /* USING_PUPNP */ #endif -diff --git a/src/lib/upnp/ixmlwrap.cxx b/src/lib/upnp/ixmlwrap.cxx -index 4e44f35a6..c7798e557 100644 --- a/src/lib/upnp/ixmlwrap.cxx +++ b/src/lib/upnp/ixmlwrap.cxx @@ -15,6 +15,9 @@ @@ -383,13 +365,11 @@ index 4e44f35a6..c7798e557 100644 #include "ixmlwrap.hxx" #include "UniqueIxml.hxx" -@@ -39,3 +42,4 @@ getFirstElementValue(IXML_Document *doc, const char *name) noexcept +@@ -39,3 +42,4 @@ getFirstElementValue(IXML_Document *doc, } } +#endif -diff --git a/src/lib/upnp/ixmlwrap.hxx b/src/lib/upnp/ixmlwrap.hxx -index 6713d59bd..4b01801f7 100644 --- a/src/lib/upnp/ixmlwrap.hxx +++ b/src/lib/upnp/ixmlwrap.hxx @@ -17,6 +17,7 @@ @@ -406,8 +386,6 @@ index 6713d59bd..4b01801f7 100644 +#endif /* USING_PUPNP */ #endif /* _IXMLWRAP_H_INCLUDED_ */ -diff --git a/src/lib/upnp/meson.build b/src/lib/upnp/meson.build -index 9e16f7319..bdc248e6c 100644 --- a/src/lib/upnp/meson.build +++ b/src/lib/upnp/meson.build @@ -1,4 +1,22 @@ diff --git a/sound/pulseaudio/patches/010-iconv.patch b/sound/pulseaudio/patches/010-iconv.patch index c98a24d5bb..5a6f394a7e 100644 --- a/sound/pulseaudio/patches/010-iconv.patch +++ b/sound/pulseaudio/patches/010-iconv.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -380,12 +380,11 @@ if dl_dep.found() +@@ -391,12 +391,11 @@ if dl_dep.found() endif have_iconv = false diff --git a/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch b/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch index 5aa5c5300a..84db6b8c6d 100644 --- a/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch +++ b/sound/shairplay/patches/010-configure-only-check-for-dns_sd.h-in-case-libdl-was-.patch @@ -8,8 +8,6 @@ Subject: [PATCH] [configure] - only check for dns_sd.h in case libdl was not configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5a4b8ad..682d74b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ LT_LIB_DLLOAD @@ -21,6 +19,3 @@ index 5a4b8ad..682d74b 100644 then AC_CHECK_HEADERS([dns_sd.h], [], [AC_MSG_ERROR([Could not find dns_sd.h header, please install libavahi-compat-libdnssd-dev or equivalent.])]) --- -2.17.1 - diff --git a/sound/squeezelite/patches/010-select_broadcast_interface.patch b/sound/squeezelite/patches/010-select_broadcast_interface.patch index 145287379f..e101fc0bbe 100644 --- a/sound/squeezelite/patches/010-select_broadcast_interface.patch +++ b/sound/squeezelite/patches/010-select_broadcast_interface.patch @@ -76,7 +76,7 @@ stream_close(); --- a/slimproto.c +++ b/slimproto.c -@@ -113,7 +113,7 @@ void send_packet(u8_t *packet, size_t len) { +@@ -113,7 +113,7 @@ void send_packet(u8_t *packet, size_t le } } @@ -94,7 +94,7 @@ struct sockaddr_in d; struct sockaddr_in s; char *buf; -@@ -778,7 +778,7 @@ in_addr_t discover_server(char *default_server) { +@@ -778,7 +778,7 @@ in_addr_t discover_server(char *default_ memset(&d, 0, sizeof(d)); d.sin_family = AF_INET; d.sin_port = htons(PORT); @@ -103,7 +103,7 @@ pollinfo.fd = disc_sock; pollinfo.events = POLLIN; -@@ -813,7 +813,7 @@ in_addr_t discover_server(char *default_server) { +@@ -813,7 +813,7 @@ in_addr_t discover_server(char *default_ #define FIXED_CAP_LEN 256 #define VAR_CAP_LEN 128 @@ -112,7 +112,7 @@ struct sockaddr_in serv_addr; static char fixed_cap[FIXED_CAP_LEN], var_cap[VAR_CAP_LEN] = ""; bool reconnect = false; -@@ -834,7 +834,7 @@ void slimproto(log_level level, char *server, u8_t mac[6], const char *name, con +@@ -834,7 +834,7 @@ void slimproto(log_level level, char *se } if (!slimproto_ip) { @@ -121,7 +121,7 @@ } if (!slimproto_port) { -@@ -915,7 +915,7 @@ void slimproto(log_level level, char *server, u8_t mac[6], const char *name, con +@@ -915,7 +915,7 @@ void slimproto(log_level level, char *se // rediscover server if it was not set at startup if (!server && ++failed_connect > 5) { @@ -132,7 +132,7 @@ } else { --- a/squeezelite.h +++ b/squeezelite.h -@@ -455,7 +455,7 @@ char* strcasestr(const char *haystack, const char *needle); +@@ -455,7 +455,7 @@ char* strcasestr(const char *haystack, c char *next_param(char *src, char c); u32_t gettime_ms(void); @@ -141,7 +141,7 @@ void set_nonblock(sockfd s); int connect_timeout(sockfd sock, const struct sockaddr *addr, socklen_t addrlen, int timeout); void server_addr(char *server, in_addr_t *ip_ptr, unsigned *port_ptr); -@@ -511,7 +511,7 @@ void buf_init(struct buffer *buf, size_t size); +@@ -511,7 +511,7 @@ void buf_init(struct buffer *buf, size_t void buf_destroy(struct buffer *buf); // slimproto.c @@ -220,29 +220,23 @@ + unsigned char *ptr; + in_addr_t bcast_addr = 0; + int have_mac = 0, have_ifname = 0; - -- } ++ + loglevel = level; - -- mac[0] = mac[1] = mac[2] = mac[3] = mac[4] = mac[5] = 0; ++ + // Check for non-zero MAC + if (mac[0] | mac[1] | mac[2] != 0) + have_mac = 1; - -- int s = socket(AF_INET, SOCK_DGRAM, 0); ++ + // Copy interface name, if it was provided. + if (iface != NULL) { + if (strlen(iface) > sizeof(ifname)) + return -1; -- ifc.ifc_len = sizeof(ifs); -- ifc.ifc_req = ifs; + strncpy(ifname, iface, sizeof(ifname) - 1); + have_ifname = 1; -+ } + } -- if (ioctl(s, SIOCGIFCONF, &ifc) == 0) { -- ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq)); +- mac[0] = mac[1] = mac[2] = mac[3] = mac[4] = mac[5] = 0; + if (getifaddrs(&addrs) == 0) { + //iterate to find corresponding ethernet address + for (ifa = addrs; ifa; ifa = ifa->ifa_next) { @@ -253,7 +247,8 @@ + || !ifa->ifa_flags & IFF_BROADCAST) { + continue; + } -+ + +- int s = socket(AF_INET, SOCK_DGRAM, 0); + if (!have_ifname) { + // We have found a valid interface name. Keep it. + strncpy(ifname, ifa->ifa_name, sizeof(ifname) - 1); @@ -265,15 +260,11 @@ + } + } -- for (ifr = ifc.ifc_req; ifr < ifend; ifr++) { -- if (ifr->ifr_addr.sa_family == AF_INET) { +- ifc.ifc_len = sizeof(ifs); +- ifc.ifc_req = ifs; -- strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name) - 1); -- if (ioctl (s, SIOCGIFHWADDR, &ifreq) == 0) { -- memcpy(mac, ifreq.ifr_hwaddr.sa_data, 6); -- if (mac[0]+mac[1]+mac[2] != 0) { -- break; -- } +- if (ioctl(s, SIOCGIFCONF, &ifc) == 0) { +- ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq)); + // Check address family. + if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET && + ((struct sockaddr_in *)ifa->ifa_broadaddr)->sin_addr.s_addr != 0) { @@ -287,7 +278,16 @@ + have_ifname = 0; + } + } -+ + +- for (ifr = ifc.ifc_req; ifr < ifend; ifr++) { +- if (ifr->ifr_addr.sa_family == AF_INET) { +- +- strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name) - 1); +- if (ioctl (s, SIOCGIFHWADDR, &ifreq) == 0) { +- memcpy(mac, ifreq.ifr_hwaddr.sa_data, 6); +- if (mac[0]+mac[1]+mac[2] != 0) { +- break; +- } + // Find MAC address matching interface + if (!have_mac && bcast_addr != 0) { + for (ifa = addrs; ifa; ifa = ifa->ifa_next) { diff --git a/sound/squeezelite/patches/020-no_libmad.patch b/sound/squeezelite/patches/020-no_libmad.patch index c65243210b..435a31e82e 100644 --- a/sound/squeezelite/patches/020-no_libmad.patch +++ b/sound/squeezelite/patches/020-no_libmad.patch @@ -20,7 +20,7 @@ LINKALL_IR = -llirc_client --- a/decode.c +++ b/decode.c -@@ -184,11 +184,7 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud +@@ -184,11 +184,7 @@ void decode_init(log_level level, const if (!strstr(exclude_codecs, "pcm") && (!include_codecs || (order_codecs = strstr(include_codecs, "pcm")))) sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_pcm()); diff --git a/sound/svox/patches/0002-gitignore-for-autotools-files.patch b/sound/svox/patches/0002-gitignore-for-autotools-files.patch index df57df7f76..9fc0d792a8 100644 --- a/sound/svox/patches/0002-gitignore-for-autotools-files.patch +++ b/sound/svox/patches/0002-gitignore-for-autotools-files.patch @@ -8,9 +8,6 @@ Subject: [PATCH 2/7] gitignore for autotools files 1 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 pico/.gitignore -diff --git a/pico/.gitignore b/pico/.gitignore -new file mode 100644 -index 0000000..4235569 --- /dev/null +++ b/pico/.gitignore @@ -0,0 +1,32 @@ @@ -46,6 +43,3 @@ index 0000000..4235569 +.libs +libttspico.la + --- -1.7.1 - diff --git a/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch b/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch index 19b6df1b91..7744964adc 100644 --- a/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch +++ b/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch @@ -11,8 +11,6 @@ Subject: [PATCH 3/7] pico2wave: Convert text to .wav using svox text-to-speech s 4 files changed, 352 insertions(+), 0 deletions(-) create mode 100644 pico/bin/pico2wave.c -diff --git a/pico/.gitignore b/pico/.gitignore -index 4235569..a110298 100644 --- a/pico/.gitignore +++ b/pico/.gitignore @@ -29,4 +29,5 @@ libtool @@ -21,8 +19,6 @@ index 4235569..a110298 100644 libttspico.la +pico2wave -diff --git a/pico/Makefile.am b/pico/Makefile.am -index 6d8a10c..0d9472d 100644 --- a/pico/Makefile.am +++ b/pico/Makefile.am @@ -34,3 +34,10 @@ libttspico_la_SOURCES = \ @@ -36,9 +32,6 @@ index 6d8a10c..0d9472d 100644 + libttspico.la -lm -lpopt +pico2wave_CFLAGS = -Wall -I lib + -diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c -new file mode 100644 -index 0000000..0c035a7 --- /dev/null +++ b/pico/bin/pico2wave.c @@ -0,0 +1,342 @@ @@ -384,8 +377,6 @@ index 0000000..0c035a7 + exit(ret); +} + -diff --git a/pico/configure.in b/pico/configure.in -index 0afb56d..349eb1d 100644 --- a/pico/configure.in +++ b/pico/configure.in @@ -14,3 +14,6 @@ AC_CONFIG_FILES([Makefile]) @@ -395,6 +386,3 @@ index 0afb56d..349eb1d 100644 + +AC_CHECK_LIB(popt, poptGetContext) + --- -1.7.1 - diff --git a/sound/svox/patches/0004-add-header-files.patch b/sound/svox/patches/0004-add-header-files.patch index f05730827d..3294b1467c 100644 --- a/sound/svox/patches/0004-add-header-files.patch +++ b/sound/svox/patches/0004-add-header-files.patch @@ -7,8 +7,6 @@ Subject: [PATCH 4/7] add header files pico/Makefile.am | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) -diff --git a/pico/Makefile.am b/pico/Makefile.am -index 0d9472d..9151042 100644 --- a/pico/Makefile.am +++ b/pico/Makefile.am @@ -34,6 +34,42 @@ libttspico_la_SOURCES = \ @@ -54,6 +52,3 @@ index 0d9472d..9151042 100644 bin_PROGRAMS = pico2wave pico2wave_SOURCES = \ bin/pico2wave.c --- -1.7.1 - diff --git a/sound/svox/patches/0005-Install-lang-files.patch b/sound/svox/patches/0005-Install-lang-files.patch index 95344e31f7..b5dbf78e01 100644 --- a/sound/svox/patches/0005-Install-lang-files.patch +++ b/sound/svox/patches/0005-Install-lang-files.patch @@ -7,8 +7,6 @@ Subject: [PATCH 5/7] Install lang files pico/Makefile.am | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) -diff --git a/pico/Makefile.am b/pico/Makefile.am -index 9151042..8898050 100644 --- a/pico/Makefile.am +++ b/pico/Makefile.am @@ -70,6 +70,15 @@ libttspico_la_HEADERS = \ @@ -27,6 +25,3 @@ index 9151042..8898050 100644 bin_PROGRAMS = pico2wave pico2wave_SOURCES = \ bin/pico2wave.c --- -1.7.1 - diff --git a/sound/svox/patches/0006-Set-picolangdir.patch b/sound/svox/patches/0006-Set-picolangdir.patch index 1ec646d752..c6291a666d 100644 --- a/sound/svox/patches/0006-Set-picolangdir.patch +++ b/sound/svox/patches/0006-Set-picolangdir.patch @@ -8,8 +8,6 @@ Subject: [PATCH 6/7] Set picolangdir pico/bin/pico2wave.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) -diff --git a/pico/Makefile.am b/pico/Makefile.am -index 8898050..a19c42a 100644 --- a/pico/Makefile.am +++ b/pico/Makefile.am @@ -84,5 +84,5 @@ pico2wave_SOURCES = \ @@ -19,11 +17,9 @@ index 8898050..a19c42a 100644 -pico2wave_CFLAGS = -Wall -I lib +pico2wave_CFLAGS = -Wall -Dpicolangdir=\"$(picolangdir)\" -I lib -diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c -index 0c035a7..ec7ab79 100644 --- a/pico/bin/pico2wave.c +++ b/pico/bin/pico2wave.c -@@ -35,7 +35,11 @@ +@@ -36,7 +36,11 @@ /* string constants */ #define MAX_OUTBUF_SIZE 128 @@ -35,6 +31,3 @@ index 0c035a7..ec7ab79 100644 const char * PICO_VOICE_NAME = "PicoVoice"; /* supported voices --- -1.7.1 - diff --git a/sound/svox/patches/0008-64bits.patch b/sound/svox/patches/0008-64bits.patch index 883a42e6de..432c16905b 100644 --- a/sound/svox/patches/0008-64bits.patch +++ b/sound/svox/patches/0008-64bits.patch @@ -2,9 +2,9 @@ Description: fix execution on 64bit archs Bug: http://code.google.com/p/android/issues/detail?id=12224 Author: Samuel Thibault ---- svox/pico/lib/picoapi.c.original 2010-10-25 19:06:57.000000000 +0200 -+++ svox/pico/lib/picoapi.c 2010-10-25 19:07:18.000000000 +0200 -@@ -90,7 +90,7 @@ +--- a/pico/lib/picoapi.c ++++ b/pico/lib/picoapi.c +@@ -90,7 +90,7 @@ pico_Status pico_initialize_priv( status = PICO_ERR_NULLPTR_ACCESS; } else { byte_ptr_t rest_mem; @@ -13,9 +13,9 @@ Author: Samuel Thibault pico_System sys; picoos_MemoryManager sysMM; picoos_ExceptionManager sysEM; ---- svox/pico/lib/picosig2.c.original 2010-10-26 00:17:18.000000000 +0200 -+++ svox/pico/lib/picosig2.c 2010-10-26 00:17:19.000000000 +0200 -@@ -568,7 +568,7 @@ +--- a/pico/lib/picosig2.c ++++ b/pico/lib/picosig2.c +@@ -552,7 +552,7 @@ void mel_2_lin_lookup(sig_innerobj_t *si for (nI = 1; nI < m1; nI++) { XXr[nI] = c1[nI] << shift; } diff --git a/sound/svox/patches/0009-Fix-link-order.patch b/sound/svox/patches/0009-Fix-link-order.patch index bcf3870fe2..b9c6503976 100644 --- a/sound/svox/patches/0009-Fix-link-order.patch +++ b/sound/svox/patches/0009-Fix-link-order.patch @@ -1,8 +1,6 @@ -Index: svox-1.0+git20130326/pico/Makefile.am -=================================================================== ---- svox-1.0+git20130326.orig/pico/Makefile.am 2013-11-12 12:37:05.939979854 -0500 -+++ svox-1.0+git20130326/pico/Makefile.am 2013-11-12 13:00:52.336945041 -0500 -@@ -70,6 +70,8 @@ +--- a/pico/Makefile.am ++++ b/pico/Makefile.am +@@ -70,6 +70,8 @@ libttspico_la_HEADERS = \ lib/picotrns.h \ lib/picowa.h @@ -11,7 +9,7 @@ Index: svox-1.0+git20130326/pico/Makefile.am picolangdir = $(datadir)/pico/lang picolang_DATA = \ lang/de-DE*.bin \ -@@ -83,6 +85,6 @@ +@@ -83,6 +85,6 @@ bin_PROGRAMS = pico2wave pico2wave_SOURCES = \ bin/pico2wave.c pico2wave_LDADD = \ diff --git a/sound/svox/patches/0011-subdir.patch b/sound/svox/patches/0011-subdir.patch index fa9e91ffca..6f3e34f32e 100644 --- a/sound/svox/patches/0011-subdir.patch +++ b/sound/svox/patches/0011-subdir.patch @@ -1,7 +1,6 @@ -diff -urN a/pico/configure.in b/pico/configure.in ---- a/pico/configure.in 2015-01-21 18:59:39.604452795 +0100 -+++ b/pico/configure.in 2015-01-21 19:00:53.288777298 +0100 -@@ -4,7 +4,7 @@ +--- a/pico/configure.in ++++ b/pico/configure.in +@@ -4,7 +4,7 @@ AC_PREREQ(2.59) AC_INIT([svox], [1.0], [math.parent@gmail.com]) diff --git a/sound/svox/patches/0012-no-headers.patch b/sound/svox/patches/0012-no-headers.patch index edf4d046e9..6e932556cd 100644 --- a/sound/svox/patches/0012-no-headers.patch +++ b/sound/svox/patches/0012-no-headers.patch @@ -1,7 +1,6 @@ -diff -urN a/pico/Makefile.am b/pico/Makefile.am ---- a/pico/Makefile.am 2015-01-22 01:33:21.470895431 +0100 -+++ b/pico/Makefile.am 2015-01-22 01:36:03.042228475 +0100 -@@ -34,42 +34,6 @@ +--- a/pico/Makefile.am ++++ b/pico/Makefile.am +@@ -34,42 +34,6 @@ libttspico_la_SOURCES = \ lib/picotrns.c \ lib/picowa.c diff --git a/utils/acl/patches/100-no-gettext_configure.patch b/utils/acl/patches/100-no-gettext_configure.patch index 676e32c6e4..c846176147 100644 --- a/utils/acl/patches/100-no-gettext_configure.patch +++ b/utils/acl/patches/100-no-gettext_configure.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index cd3c680..3d3771b 100644 --- a/configure.ac +++ b/configure.ac -@@ -32,9 +32,6 @@ AC_FUNC_GCC_VISIBILITY +@@ -33,9 +33,6 @@ AC_SYS_LARGEFILE AM_PROG_AR LT_INIT @@ -12,7 +10,7 @@ index cd3c680..3d3771b 100644 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [Enable extra debugging])]) AS_IF([test "x$enable_debug" = "xyes"], -@@ -61,6 +58,5 @@ AC_CONFIG_COMMANDS([include/sys], +@@ -62,6 +59,5 @@ AC_CONFIG_COMMANDS([include/sys], AC_CONFIG_FILES([ libacl.pc Makefile diff --git a/utils/acl/patches/101-no-gettext_autogen.patch b/utils/acl/patches/101-no-gettext_autogen.patch index 1fad67a13b..e9a8c8c3f2 100644 --- a/utils/acl/patches/101-no-gettext_autogen.patch +++ b/utils/acl/patches/101-no-gettext_autogen.patch @@ -1,5 +1,3 @@ -diff --git a/autogen.sh b/autogen.sh -index a98a3c5..982aff1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,2 @@ diff --git a/utils/acl/patches/102-no-gettext_Makefile.patch b/utils/acl/patches/102-no-gettext_Makefile.patch index d7e7377a91..4d562b9728 100644 --- a/utils/acl/patches/102-no-gettext_Makefile.patch +++ b/utils/acl/patches/102-no-gettext_Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index 47d2a4e..d02ee91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/utils/at/patches/100-remove-glibc-assumption.patch b/utils/at/patches/100-remove-glibc-assumption.patch index a18a007a96..f8a5e59f4d 100644 --- a/utils/at/patches/100-remove-glibc-assumption.patch +++ b/utils/at/patches/100-remove-glibc-assumption.patch @@ -18,21 +18,19 @@ Signed-off-by: Phil Eichinger parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 --- a/parsetime.y +++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +41,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +52,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.1.4 - diff --git a/utils/attr/patches/100-no-gettext_configure.patch b/utils/attr/patches/100-no-gettext_configure.patch index c1d5b5128e..dea6f2ed91 100644 --- a/utils/attr/patches/100-no-gettext_configure.patch +++ b/utils/attr/patches/100-no-gettext_configure.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index a5f9de5..4c77e97 100644 --- a/configure.ac +++ b/configure.ac -@@ -34,9 +34,6 @@ AC_FUNC_ALLOCA +@@ -34,9 +34,6 @@ AC_FUNC_GCC_VISIBILITY AM_PROG_AR LT_INIT diff --git a/utils/attr/patches/101-no-gettext_autogen.patch b/utils/attr/patches/101-no-gettext_autogen.patch index 1fad67a13b..e9a8c8c3f2 100644 --- a/utils/attr/patches/101-no-gettext_autogen.patch +++ b/utils/attr/patches/101-no-gettext_autogen.patch @@ -1,5 +1,3 @@ -diff --git a/autogen.sh b/autogen.sh -index a98a3c5..982aff1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,2 @@ diff --git a/utils/attr/patches/102-no-gettext_Makefile.patch b/utils/attr/patches/102-no-gettext_Makefile.patch index 76c8dcd3aa..4d562b9728 100644 --- a/utils/attr/patches/102-no-gettext_Makefile.patch +++ b/utils/attr/patches/102-no-gettext_Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index a3e8353..381bb55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/utils/attr/patches/110-Replace-bzero-with-memset.patch b/utils/attr/patches/110-Replace-bzero-with-memset.patch index 4607451ecb..cfae36a096 100644 --- a/utils/attr/patches/110-Replace-bzero-with-memset.patch +++ b/utils/attr/patches/110-Replace-bzero-with-memset.patch @@ -13,11 +13,9 @@ Signed-off-by: Rosen Penev tools/attr.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/include/attributes.h b/include/attributes.h -index 14beb8f..039c817 100644 --- a/include/attributes.h +++ b/include/attributes.h -@@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data from attr_list() */ +@@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data fr * Implement a "cursor" for use in successive attr_list() calls. * It provides a way to find the last attribute that was returned in the * last attr_list() call so that we can get the next one without missing @@ -29,11 +27,9 @@ index 14beb8f..039c817 100644 */ typedef struct attrlist_cursor { uint32_t opaque[4]; /* an opaque cookie */ -diff --git a/libattr/libattr.c b/libattr/libattr.c -index d550e10..2ebd1c5 100644 --- a/libattr/libattr.c +++ b/libattr/libattr.c -@@ -298,7 +298,7 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, +@@ -298,7 +298,7 @@ attr_list(const char *path, char *buffer errno = EINVAL; return -1; } @@ -42,7 +38,7 @@ index d550e10..2ebd1c5 100644 if (flags & ATTR_DONTFOLLOW) length = llistxattr(path, lbuf, sizeof(lbuf)); -@@ -348,7 +348,7 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, +@@ -348,7 +348,7 @@ attr_listf(int fd, char *buffer, const i errno = EINVAL; return -1; } @@ -51,8 +47,6 @@ index d550e10..2ebd1c5 100644 length = flistxattr(fd, lbuf, sizeof(lbuf)); if (length < 0) -diff --git a/tools/attr.c b/tools/attr.c -index c8aa0b4..312aef1 100644 --- a/tools/attr.c +++ b/tools/attr.c @@ -228,7 +228,7 @@ main(int argc, char **argv) @@ -64,6 +58,3 @@ index c8aa0b4..312aef1 100644 do { error = attr_list(filename, buffer, BUFSIZE, attrflags, &cursor); --- -2.17.1 - diff --git a/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch b/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch index ac292c57d1..2fa5c5933f 100644 --- a/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch +++ b/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch @@ -12,8 +12,6 @@ Signed-off-by: Thomas Petazzoni src/ausearch-lol.c | 12 +++++++++++- 4 files changed, 43 insertions(+), 4 deletions(-) -diff --git a/auparse/auparse.c b/auparse/auparse.c -index 650db02..2e1c737 100644 --- a/auparse/auparse.c +++ b/auparse/auparse.c @@ -1,5 +1,5 @@ @@ -23,7 +21,7 @@ index 650db02..2e1c737 100644 * All Rights Reserved. * * This library is free software; you can redistribute it and/or -@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) +@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t return 0; } @@ -40,8 +38,6 @@ index 650db02..2e1c737 100644 /* Returns 0 on success and 1 on error */ static int extract_timestamp(const char *b, au_event_t *e) { -diff --git a/auparse/interpret.c b/auparse/interpret.c -index 51c4a5e..67b7b77 100644 --- a/auparse/interpret.c +++ b/auparse/interpret.c @@ -853,6 +853,13 @@ err_out: @@ -58,7 +54,7 @@ index 51c4a5e..67b7b77 100644 static const char *print_proctitle(const char *val) { char *out = (char *)print_escaped(val); -@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) +@@ -863,7 +870,7 @@ static const char *print_proctitle(const // Proctitle has arguments separated by NUL bytes // We need to write over the NUL bytes with a space // so that we can see the arguments @@ -67,8 +63,6 @@ index 51c4a5e..67b7b77 100644 if (ptr >= end) break; *ptr = ' '; -diff --git a/configure.ac b/configure.ac -index 6e345f1..6f3007e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ @@ -80,7 +74,7 @@ index 6e345f1..6f3007e 100644 ### ### Permission is hereby granted, free of charge, to any person obtaining a ### copy of this software and associated documentation files (the "Software"), -@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote +@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-r AC_CHECK_FUNCS([posix_fallocate]) dnl; signalfd is needed for libev AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) @@ -99,8 +93,6 @@ index 6e345f1..6f3007e 100644 ALLWARNS="" ALLDEBUG="-g" -diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index 5d17a72..758c33e 100644 --- a/src/ausearch-lol.c +++ b/src/ausearch-lol.c @@ -1,6 +1,6 @@ @@ -111,7 +103,7 @@ index 5d17a72..758c33e 100644 * All Rights Reserved. * * This software may be freely redistributed and/or modified under the -@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) +@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, return 0; } @@ -128,6 +120,3 @@ index 5d17a72..758c33e 100644 /* * This function will look at the line and pick out pieces of it. */ --- -2.21.0 - diff --git a/utils/audit/patches/0002-fix-gcc-10.patch b/utils/audit/patches/0002-fix-gcc-10.patch index 5986cf0e42..19c0c4c3bc 100644 --- a/utils/audit/patches/0002-fix-gcc-10.patch +++ b/utils/audit/patches/0002-fix-gcc-10.patch @@ -8,8 +8,6 @@ Subject: [PATCH 01/30] Header definitions need to be external when building src/ausearch-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/ausearch-common.h b/src/ausearch-common.h -index 6669203..3040547 100644 --- a/src/ausearch-common.h +++ b/src/ausearch-common.h @@ -50,7 +50,7 @@ extern pid_t event_pid; @@ -21,6 +19,3 @@ index 6669203..3040547 100644 extern const char *event_comm; extern const char *event_filename; extern const char *event_hostname; --- -2.26.2 - diff --git a/utils/avrdude/patches/020-no-cpp-timestamps.patch b/utils/avrdude/patches/020-no-cpp-timestamps.patch index 8427055af6..dab8a43710 100644 --- a/utils/avrdude/patches/020-no-cpp-timestamps.patch +++ b/utils/avrdude/patches/020-no-cpp-timestamps.patch @@ -6,7 +6,7 @@ Author: Milan Kupcevic This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/main.c +++ b/main.c -@@ -679,10 +679,10 @@ +@@ -679,10 +679,10 @@ int main(int argc, char * argv []) * Print out an identifying string so folks can tell what version * they are running */ diff --git a/utils/avrdude/patches/110-ud-to-u.patch b/utils/avrdude/patches/110-ud-to-u.patch index 4036c28c21..470f4da679 100644 --- a/utils/avrdude/patches/110-ud-to-u.patch +++ b/utils/avrdude/patches/110-ud-to-u.patch @@ -1,6 +1,6 @@ --- a/linuxgpio.c +++ b/linuxgpio.c -@@ -66,7 +66,7 @@ static int linuxgpio_export(unsigned int gpio) +@@ -66,7 +66,7 @@ static int linuxgpio_export(unsigned int return fd; } @@ -9,7 +9,7 @@ r = write(fd, buf, len); close(fd); -@@ -84,7 +84,7 @@ static int linuxgpio_unexport(unsigned int gpio) +@@ -84,7 +84,7 @@ static int linuxgpio_unexport(unsigned i return fd; } @@ -18,7 +18,7 @@ r = write(fd, buf, len); close(fd); -@@ -95,7 +95,7 @@ static int linuxgpio_openfd(unsigned int gpio) +@@ -95,7 +95,7 @@ static int linuxgpio_openfd(unsigned int { char filepath[60]; @@ -27,7 +27,7 @@ return (open(filepath, O_RDWR)); } -@@ -104,7 +104,7 @@ static int linuxgpio_dir(unsigned int gpio, unsigned int dir) +@@ -104,7 +104,7 @@ static int linuxgpio_dir(unsigned int gp int fd, r; char buf[60]; diff --git a/utils/bc/patches/001-disable-doc.patch b/utils/bc/patches/001-disable-doc.patch index a6ecd6e9f4..4b80086390 100644 --- a/utils/bc/patches/001-disable-doc.patch +++ b/utils/bc/patches/001-disable-doc.patch @@ -1,6 +1,6 @@ ---- bc-1.06.95/Makefile.in 2010-07-03 10:48:13.422725147 +0000 -+++ bc-1.06.95/Makefile.in 2010-07-03 10:50:09.714725197 +0000 -@@ -149,7 +149,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -149,7 +149,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -9,8 +9,8 @@ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ stamp-h $(distdir).tar.gz h/number.h depcomp missing ---- bc-1.06.95/Makefile.am 2010-07-03 10:48:32.522725037 +0000 -+++ bc-1.06.95/Makefile.am 2010-07-03 10:48:38.114725024 +0000 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in diff --git a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch index 070ed58417..2a3510b6f7 100644 --- a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch +++ b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch @@ -7,10 +7,8 @@ Subject: [PATCH 1/4] bcm43xx: Add bcm43xx-3wire variant tools/hciattach.c | 3 +++ 1 file changed, 3 insertions(+) -Index: bluez-5.51/tools/hciattach.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach.c -+++ bluez-5.51/tools/hciattach.c +--- a/tools/hciattach.c ++++ b/tools/hciattach.c @@ -1091,6 +1091,9 @@ struct uart_t uart[] = { { "bcm43xx", 0x0000, 0x0000, HCI_UART_H4, 115200, 3000000, FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL }, diff --git a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch index 0ae7d15cdf..4b68f07bbb 100644 --- a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch +++ b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch @@ -8,10 +8,8 @@ Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware tools/hciattach_bcm43xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: bluez-5.51/tools/hciattach_bcm43xx.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach_bcm43xx.c -+++ bluez-5.51/tools/hciattach_bcm43xx.c +--- a/tools/hciattach_bcm43xx.c ++++ b/tools/hciattach_bcm43xx.c @@ -367,11 +367,8 @@ int bcm43xx_init(int fd, int def_speed, return -1; diff --git a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch index e66ac5e531..b99976643b 100644 --- a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch +++ b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch @@ -7,10 +7,8 @@ Subject: [PATCH 3/4] Increase firmware load timeout to 30s tools/hciattach.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: bluez-5.51/tools/hciattach.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach.c -+++ bluez-5.51/tools/hciattach.c +--- a/tools/hciattach.c ++++ b/tools/hciattach.c @@ -1240,7 +1240,7 @@ int main(int argc, char *argv[]) { struct uart_t *u = NULL; diff --git a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch index b86dc8363c..355f17b6d7 100644 --- a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch +++ b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch @@ -7,10 +7,8 @@ Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware tools/hciattach_bcm43xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: bluez-5.51/tools/hciattach_bcm43xx.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach_bcm43xx.c -+++ bluez-5.51/tools/hciattach_bcm43xx.c +--- a/tools/hciattach_bcm43xx.c ++++ b/tools/hciattach_bcm43xx.c @@ -44,7 +44,7 @@ #include "hciattach.h" diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index 089604fc90..e0dc08c76a 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,7 +1,5 @@ -Index: bluez-5.54/Makefile.in -=================================================================== ---- bluez-5.54.orig/Makefile.in -+++ bluez-5.54/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -3214,7 +3214,7 @@ unit_tests = $(am__append_54) unit/test- @CLIENT_TRUE@ client/gatt.h client/gatt.c diff --git a/utils/bluez/patches/202-fix-endianness.patch b/utils/bluez/patches/202-fix-endianness.patch index 34b42cbfa0..a92cdd04ad 100644 --- a/utils/bluez/patches/202-fix-endianness.patch +++ b/utils/bluez/patches/202-fix-endianness.patch @@ -1,7 +1,5 @@ -Index: bluez-5.53/src/shared/util.h -=================================================================== ---- bluez-5.53.orig/src/shared/util.h -+++ bluez-5.53/src/shared/util.h +--- a/src/shared/util.h ++++ b/src/shared/util.h @@ -26,6 +26,7 @@ #include #include diff --git a/utils/bluez/patches/203-obexd_without_systemd.patch b/utils/bluez/patches/203-obexd_without_systemd.patch index 9e3761f927..c79ce3e776 100644 --- a/utils/bluez/patches/203-obexd_without_systemd.patch +++ b/utils/bluez/patches/203-obexd_without_systemd.patch @@ -16,10 +16,8 @@ directly, and to do so it needs the full path of the daemon. delete mode 100644 obexd/src/org.bluez.obex.service create mode 100644 obexd/src/org.bluez.obex.service.in -Index: bluez-5.51/Makefile.obexd -=================================================================== ---- bluez-5.51.orig/Makefile.obexd -+++ bluez-5.51/Makefile.obexd +--- a/Makefile.obexd ++++ b/Makefile.obexd @@ -1,12 +1,12 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) @@ -35,19 +33,15 @@ Index: bluez-5.51/Makefile.obexd if OBEX -Index: bluez-5.51/obexd/src/org.bluez.obex.service -=================================================================== ---- bluez-5.51.orig/obexd/src/org.bluez.obex.service +--- a/obexd/src/org.bluez.obex.service +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.bluez.obex -Exec=/bin/false -SystemdService=dbus-org.bluez.obex.service -Index: bluez-5.51/obexd/src/org.bluez.obex.service.in -=================================================================== --- /dev/null -+++ bluez-5.51/obexd/src/org.bluez.obex.service.in ++++ b/obexd/src/org.bluez.obex.service.in @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.bluez.obex diff --git a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch index f0fc7dcd86..ed45f98cd7 100644 --- a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch +++ b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch @@ -32,10 +32,8 @@ This commit prevents the call to btd_adv_manager_refresh for non-LE devices. src/adapter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: bluez-5.54/src/adapter.c -=================================================================== ---- bluez-5.54.orig/src/adapter.c -+++ bluez-5.54/src/adapter.c +--- a/src/adapter.c ++++ b/src/adapter.c @@ -567,7 +567,8 @@ static void settings_changed(struct btd_ g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Discoverable"); diff --git a/utils/bonnie++/patches/010-openwrt-fixes.patch b/utils/bonnie++/patches/010-openwrt-fixes.patch index 37a99eba9a..123a481a88 100644 --- a/utils/bonnie++/patches/010-openwrt-fixes.patch +++ b/utils/bonnie++/patches/010-openwrt-fixes.patch @@ -13,7 +13,7 @@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ -@@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.cpp +@@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.c GETCHOBJS=$(GETCHSRC:.cpp=.o) bonnie++: $(BONOBJS) @@ -70,7 +70,7 @@ , linux_pthread="yes") if [[ -n "$linux_pthread" ]]; then linux_pthread="#define LINUX_PTHREAD" -@@ -83,7 +82,7 @@ void * thread_func(void * param) { return NULL; } +@@ -83,7 +82,7 @@ void * thread_func(void * param) { retur , thread_ldflags="-pthread") AC_SUBST(large_file) diff --git a/utils/ccrypt/patches/001-no-intl.patch b/utils/ccrypt/patches/001-no-intl.patch index 13db6e6fbf..cac7ffbbc2 100644 --- a/utils/ccrypt/patches/001-no-intl.patch +++ b/utils/ccrypt/patches/001-no-intl.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index bfe1d43..2f45264 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ @@ -11,11 +9,9 @@ index bfe1d43..2f45264 100644 EXTRA_DIST = m4/ChangeLog config.rpath README-WIN -diff --git a/Makefile.in b/Makefile.in -index 314e162..18dcff3 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -117,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -117,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -42,15 +38,12 @@ index 314e162..18dcff3 100644 EXTRA_DIST = m4/ChangeLog config.rpath README-WIN ACLOCAL_AMFLAGS = -I m4 all: config.h -diff --git a/configure.ac b/configure.ac -index 56d11f1..6d32602 100644 --- a/configure.ac +++ b/configure.ac -@@ -148,17 +148,6 @@ fi - AC_MSG_RESULT($UINT32_TYPE) +@@ -149,17 +149,6 @@ AC_MSG_RESULT($UINT32_TYPE) AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type) --dnl ---------------------------------------------------------------------- + dnl ---------------------------------------------------------------------- -dnl Internationalization - -GETTEXT_PACKAGE=ccrypt @@ -61,9 +54,10 @@ index 56d11f1..6d32602 100644 -AM_GNU_GETTEXT_VERSION([0.19.8]) -dnl IT_PO_SUBDIR(po) - - dnl ---------------------------------------------------------------------- +-dnl ---------------------------------------------------------------------- dnl Libtool (needed by intl/) + LT_INIT @@ -180,9 +169,7 @@ AC_SUBST(TAR) dnl ---------------------------------------------------------------------- AC_CONFIG_FILES([doc/ccrypt.1 @@ -74,8 +68,6 @@ index 56d11f1..6d32602 100644 Makefile src/Makefile emacs/Makefile -diff --git a/src/Makefile.am b/src/Makefile.am -index 4cb1d03..ff33d59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,4 +56,4 @@ uninstall-local: @@ -84,8 +76,6 @@ index 4cb1d03..ff33d59 100644 AM_CPPFLAGS = @EXTRA_INCLUDES@ -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" -LIBS = @LIBINTL@ @LIBS@ +LIBS = @LIBS@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 27c7d28..01c6764 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -278,7 +278,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@ diff --git a/utils/cmdpad/patches/100-Makefile.patch b/utils/cmdpad/patches/100-Makefile.patch index 61a6c8f4c1..6ebe1b88be 100644 --- a/utils/cmdpad/patches/100-Makefile.patch +++ b/utils/cmdpad/patches/100-Makefile.patch @@ -1,5 +1,5 @@ ---- cmdpad-0.0.3/src/Makefile.orig 2008-01-05 23:29:44.000000000 +0100 -+++ cmdpad-0.0.3/src/Makefile 2008-01-05 23:30:23.000000000 +0100 +--- a/src/Makefile ++++ b/src/Makefile @@ -5,25 +5,25 @@ TOP=.. include $(TOP)/Makefile.common diff --git a/utils/cmdpad/patches/120-kernel26-compat.patch b/utils/cmdpad/patches/120-kernel26-compat.patch index eb7beeb32b..6a9813e7d3 100644 --- a/utils/cmdpad/patches/120-kernel26-compat.patch +++ b/utils/cmdpad/patches/120-kernel26-compat.patch @@ -1,6 +1,6 @@ ---- cmdpad-0.0.3/src/parse.orig 2008-01-05 23:55:32.000000000 +0100 -+++ cmdpad-0.0.3/src/parse.c 2008-01-05 23:56:07.000000000 +0100 -@@ -289,6 +289,12 @@ +--- a/src/parse.c ++++ b/src/parse.c +@@ -289,6 +289,12 @@ int ParseCommand( char * pchCommandLine) pchEventDevice = strdup( pchValue) ; return 1 ; } diff --git a/utils/cmdpad/patches/130-no_zombie.patch b/utils/cmdpad/patches/130-no_zombie.patch index aa4fc6a0af..e359a1b0d2 100644 --- a/utils/cmdpad/patches/130-no_zombie.patch +++ b/utils/cmdpad/patches/130-no_zombie.patch @@ -1,6 +1,6 @@ ---- cmdpad-0.0.3/src/command.c.orig 2003-03-29 17:54:12.000000000 +0100 -+++ cmdpad-0.0.3/src/command.c 2008-01-12 05:41:22.000000000 +0100 -@@ -68,6 +68,7 @@ +--- a/src/command.c ++++ b/src/command.c +@@ -68,6 +68,7 @@ struct CMD * cmd = NULL ; void exec( char * command) { @@ -8,7 +8,7 @@ if( fork() == 0) { char ** tmp ; int i ; -@@ -88,6 +89,7 @@ +@@ -88,6 +89,7 @@ void exec( char * command) perror( "ERROR: execv") ; exit( 1) ; } // end if( fork()) diff --git a/utils/collectd/patches/920-backport-netlink-reg-noerror.patch b/utils/collectd/patches/920-backport-netlink-reg-noerror.patch index 9aef6ab1d2..650fb47739 100644 --- a/utils/collectd/patches/920-backport-netlink-reg-noerror.patch +++ b/utils/collectd/patches/920-backport-netlink-reg-noerror.patch @@ -24,11 +24,9 @@ Signed-off-by: Fabrice Fontaine src/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/netlink.c b/src/netlink.c -index 7a5da762c7..fac2fb1eb4 100644 --- a/src/netlink.c +++ b/src/netlink.c -@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type, +@@ -240,7 +240,7 @@ static int check_ignorelist(const char * for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) { #if HAVE_REGEX_H if (i->rdevice != NULL) { diff --git a/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch b/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch index 8db3c1d81d..03b3902f2a 100644 --- a/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch +++ b/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch @@ -18,8 +18,6 @@ Signed-off-by: Nick Hainke 5 files changed, 99 insertions(+) create mode 100644 src/dhcpleases.c -diff --git a/Makefile.am b/Makefile.am -index 00947da0..5ee76a00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -963,6 +963,12 @@ df_la_LDFLAGS = $(PLUGIN_LDFLAGS) @@ -35,8 +33,6 @@ index 00947da0..5ee76a00 100644 if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la disk_la_SOURCES = src/disk.c -diff --git a/README b/README -index e42e9c24..dd104408 100644 --- a/README +++ b/README @@ -106,6 +106,9 @@ Features @@ -49,11 +45,9 @@ index e42e9c24..dd104408 100644 - dns DNS traffic: Query types, response codes, opcodes and traffic/octets transferred. -diff --git a/configure.ac b/configure.ac -index bcfb8cf5..6c2b6574 100644 --- a/configure.ac +++ b/configure.ac -@@ -7061,6 +7061,7 @@ AC_PLUGIN([curl_xml], [$plugin_curl_xml], [CURL generic xml +@@ -7063,6 +7063,7 @@ AC_PLUGIN([curl_xml], [$plugi AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([dcpmm], [$with_libpmwapi], [Intel(R) Optane(TM) DC Persistent Memory performance and health statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) @@ -61,7 +55,7 @@ index bcfb8cf5..6c2b6574 100644 AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) AC_PLUGIN([dpdkevents], [$plugin_dpdkevents], [Events from DPDK]) -@@ -7508,6 +7509,7 @@ AC_MSG_RESULT([ curl_xml . . . . . . $enable_curl_xml]) +@@ -7512,6 +7513,7 @@ AC_MSG_RESULT([ curl_xml . . . . . . AC_MSG_RESULT([ dbi . . . . . . . . . $enable_dbi]) AC_MSG_RESULT([ dcpmm . . . . . . . $enable_dcpmm]) AC_MSG_RESULT([ df . . . . . . . . . $enable_df]) @@ -69,8 +63,6 @@ index bcfb8cf5..6c2b6574 100644 AC_MSG_RESULT([ disk . . . . . . . . $enable_disk]) AC_MSG_RESULT([ dns . . . . . . . . . $enable_dns]) AC_MSG_RESULT([ dpdkevents. . . . . . $enable_dpdkevents]) -diff --git a/src/collectd.conf.in b/src/collectd.conf.in -index 562a55d9..94659e81 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -119,6 +119,7 @@ @@ -81,7 +73,7 @@ index 562a55d9..94659e81 100644 #@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk #@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns #@BUILD_PLUGIN_DPDKEVENTS_TRUE@LoadPlugin dpdkevents -@@ -689,6 +690,10 @@ +@@ -690,6 +691,10 @@ # SelectNumericQueryTypes true # @@ -92,9 +84,6 @@ index 562a55d9..94659e81 100644 # # # Coremask "0x1" -diff --git a/src/dhcpleases.c b/src/dhcpleases.c -new file mode 100644 -index 00000000..f43d62bf --- /dev/null +++ b/src/dhcpleases.c @@ -0,0 +1,83 @@ @@ -181,6 +170,3 @@ index 00000000..f43d62bf + config_keys_num); + plugin_register_read("dhcpleases", dhcp_leases_read); +} --- -2.29.2 - diff --git a/utils/coreutils/patches/001-no_docs_man_tests.patch b/utils/coreutils/patches/001-no_docs_man_tests.patch index 0d8dd0d750..dde75778d1 100644 --- a/utils/coreutils/patches/001-no_docs_man_tests.patch +++ b/utils/coreutils/patches/001-no_docs_man_tests.patch @@ -9,7 +9,7 @@ EXTRA_DIST = \ .mailmap \ -@@ -210,6 +210,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src +@@ -210,6 +210,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib include $(top_srcdir)/lib/local.mk include $(top_srcdir)/src/local.mk @@ -18,7 +18,7 @@ -include $(top_srcdir)/tests/local.mk --- a/Makefile.in +++ b/Makefile.in -@@ -3156,11 +3156,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ +@@ -3156,11 +3156,7 @@ RECURSIVE_TARGETS = all-recursive check- install-ps-recursive install-recursive installcheck-recursive \ installdirs-recursive pdf-recursive ps-recursive \ tags-recursive uninstall-recursive @@ -31,7 +31,7 @@ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -3411,11 +3407,11 @@ am__DIST_COMMON = $(doc_coreutils_TEXINFOS) $(srcdir)/Makefile.in \ +@@ -3411,11 +3407,11 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF $(top_srcdir)/build-aux/missing \ $(top_srcdir)/build-aux/test-driver \ $(top_srcdir)/build-aux/texinfo.tex \ @@ -82,7 +82,7 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -7052,7 +7048,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -7052,7 +7048,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; diff --git a/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch b/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch index 9654980e99..b297f3746c 100644 --- a/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch +++ b/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch @@ -14,13 +14,11 @@ behavior. tests/ls/removed-directory.sh | 10 ++-------- 3 files changed, 8 insertions(+), 30 deletions(-) -diff --git a/NEWS b/NEWS -index fdc8bf5db..653e7178b 100644 --- a/NEWS +++ b/NEWS -@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- +@@ -97,6 +97,12 @@ GNU coreutils NEWS - * Noteworthy changes in release ?.? (????-??-??) [?] + gzip-compressed tarballs are distributed once again +** Changes in behavior + @@ -29,10 +27,8 @@ index fdc8bf5db..653e7178b 100644 + that was made in release 8.32. + - * Noteworthy changes in release 8.32 (2020-03-05) [stable] + * Noteworthy changes in release 8.31 (2019-03-10) [stable] -diff --git a/src/ls.c b/src/ls.c -index 24b983287..4acf5f44d 100644 --- a/src/ls.c +++ b/src/ls.c @@ -49,10 +49,6 @@ @@ -46,7 +42,7 @@ index 24b983287..4acf5f44d 100644 #include #include #include -@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const struct dirent *next; uintmax_t total_blocks = 0; static bool first = true; @@ -54,7 +50,7 @@ index 24b983287..4acf5f44d 100644 errno = 0; dirp = opendir (name); -@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const next = readdir (dirp); if (next) { @@ -62,7 +58,7 @@ index 24b983287..4acf5f44d 100644 if (! file_ignored (next->d_name)) { enum filetype type = unknown; -@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const if (errno != EOVERFLOW) break; } @@ -85,8 +81,6 @@ index 24b983287..4acf5f44d 100644 else break; -diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh -index e8c835dab..fe8f929a1 100755 --- a/tests/ls/removed-directory.sh +++ b/tests/ls/removed-directory.sh @@ -26,20 +26,14 @@ case $host_triplet in @@ -112,6 +106,3 @@ index e8c835dab..fe8f929a1 100755 +compare /dev/null err || fail=1 Exit $fail --- -cgit v1.2.1 - diff --git a/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch index dbc443384d..02e1faa074 100644 --- a/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch +++ b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch @@ -11,8 +11,6 @@ Signed-off-by: Pawel Dembicki src/relay_drv_gpio.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) -diff --git a/src/data_types.h b/src/data_types.h -index f13baeb..d4dc7b1 100644 --- a/src/data_types.h +++ b/src/data_types.h @@ -56,14 +56,14 @@ typedef struct @@ -38,8 +36,6 @@ index f13baeb..d4dc7b1 100644 /* [Sainsmart drv] */ uint8_t sainsmart_num_relays; -diff --git a/src/relay_drv_gpio.c b/src/relay_drv_gpio.c -index 705c157..28464be 100644 --- a/src/relay_drv_gpio.c +++ b/src/relay_drv_gpio.c @@ -53,7 +53,7 @@ @@ -51,7 +47,7 @@ index 705c157..28464be 100644 { 0, // dummy 0, // pin 1 -@@ -85,7 +85,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st +@@ -85,7 +85,7 @@ int set_relay_generic_gpio(char* portnam * -1 - fail * -2 - already exported *********************************************************/ @@ -69,7 +65,7 @@ index 705c157..28464be 100644 { int fd; char b[64]; -@@ -261,7 +261,7 @@ int get_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t* relay_s +@@ -261,7 +261,7 @@ int get_relay_generic_gpio(char* portnam int fd; char b[64]; char d[1]; @@ -78,7 +74,7 @@ index 705c157..28464be 100644 if (relay(FIRST_RELAY+g_num_relays-1)) { -@@ -324,7 +324,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st +@@ -324,7 +324,7 @@ int set_relay_generic_gpio(char* portnam int fd; char b[64]; char d[1]; @@ -87,6 +83,3 @@ index 705c157..28464be 100644 if (relay(FIRST_RELAY+g_num_relays-1)) { --- -2.17.1 - diff --git a/utils/device-observatory/patches/020-libmicrohttpd.patch b/utils/device-observatory/patches/020-libmicrohttpd.patch index e065af8f77..3d2844b60b 100644 --- a/utils/device-observatory/patches/020-libmicrohttpd.patch +++ b/utils/device-observatory/patches/020-libmicrohttpd.patch @@ -1,6 +1,6 @@ --- a/src/webserver.c +++ b/src/webserver.c -@@ -129,7 +129,7 @@ const char *get_mimetype(const char str[]) +@@ -129,7 +129,7 @@ const char *get_mimetype(const char str[ return "application/octet-stream"; } @@ -9,7 +9,7 @@ const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) { -@@ -142,7 +142,7 @@ static int send_response(void *cls, struct MHD_Connection *connection, +@@ -142,7 +142,7 @@ static int send_response(void *cls, stru struct device *device; int is_localhost; FILE *fp; diff --git a/utils/digitemp/patches/0001_add_missing_includes.patch b/utils/digitemp/patches/0001_add_missing_includes.patch index 3774951ab8..a1fbc4292e 100644 --- a/utils/digitemp/patches/0001_add_missing_includes.patch +++ b/utils/digitemp/patches/0001_add_missing_includes.patch @@ -1,5 +1,5 @@ ---- a/src/ds2438.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/src/ds2438.c 2017-07-02 22:52:36.671830316 +0200 +--- a/src/ds2438.c ++++ b/src/ds2438.c @@ -5,6 +5,7 @@ Licensed under GPL v2 ----------------------------------------------------------------------- */ @@ -7,66 +7,62 @@ +#include #include "ownet.h" #include "ad26.h" - ---- a/userial/ad26.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ad26.c 2017-07-02 22:58:03.902024016 +0200 + +--- a/userial/ad26.c ++++ b/userial/ad26.c @@ -33,7 +33,7 @@ #include "ownet.h" #include "ad26.h" #include "owproto.h" - +#include "sys/types.h" - + extern int owBlock(int,int,uchar *,int); extern void setcrc8(int,uchar); - ---- a/userial/cnt1d.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/cnt1d.c 2017-07-02 22:56:26.850619935 +0200 +--- a/userial/cnt1d.c ++++ b/userial/cnt1d.c @@ -29,6 +29,7 @@ // Version: 2.00 // // +#include "sys/types.h" #include "ownet.h" - + // external One Wire functions from nework layer - ---- a/userial/crcutil.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/crcutil.c 2017-07-02 22:55:13.631039389 +0200 +--- a/userial/crcutil.c ++++ b/userial/crcutil.c @@ -29,6 +29,7 @@ - + // Include files #include "ownet.h" +#include "sys/types.h" - + // Local subroutines void setcrc16(int,ushort); - ---- a/userial/ds9097u/owtrnu.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ds9097u/owtrnu.c 2017-07-02 23:00:52.320902969 +0200 +--- a/userial/ds9097u/owtrnu.c ++++ b/userial/ds9097u/owtrnu.c @@ -39,6 +39,7 @@ // Added file I/O operations // - + +#include "sys/types.h" #include "ownet.h" #include "ds2480.h" - ---- a/userial/ioutil.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ioutil.c 2017-07-02 22:55:48.378843851 +0200 + +--- a/userial/ioutil.c ++++ b/userial/ioutil.c @@ -36,6 +36,7 @@ #include #include #include "ownet.h" +#include "sys/types.h" - + #ifdef __MC68K__ #include - ---- a/userial/owproto.h 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/owproto.h 2017-07-02 22:58:59.561664538 +0200 +--- a/userial/owproto.h ++++ b/userial/owproto.h @@ -1,3 +1,4 @@ +#include "sys/types.h" /* Prototypes for userial driver functions */ - + /* From other low level userial files */ diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch index ba6bba32c9..b9b0a6b8c9 100644 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ b/utils/dockerd/patches/001-libdevmapper_name_fix.patch @@ -1,7 +1,5 @@ -Index: docker-ce-20.10.0/hack/make.sh -=================================================================== ---- docker-ce-20.10.0.orig/hack/make.sh -+++ docker-ce-20.10.0/hack/make.sh +--- a/hack/make.sh ++++ b/hack/make.sh @@ -95,7 +95,7 @@ fi # with a newer libdevmapper than the one it was built with. if diff --git a/utils/domoticz/patches/010-boost-173.patch b/utils/domoticz/patches/010-boost-173.patch index b1e0561360..6c98abe001 100644 --- a/utils/domoticz/patches/010-boost-173.patch +++ b/utils/domoticz/patches/010-boost-173.patch @@ -55,8 +55,6 @@ Subject: [PATCH] Avoid deprecated bind placeholders in global namespace webserver/server.cpp | 4 +++- 49 files changed, 107 insertions(+), 32 deletions(-) -diff --git a/hardware/ASyncSerial.cpp b/hardware/ASyncSerial.cpp -index 2c9a5e27e9..36dd402fa7 100644 --- a/hardware/ASyncSerial.cpp +++ b/hardware/ASyncSerial.cpp @@ -34,7 +34,7 @@ @@ -68,8 +66,6 @@ index 2c9a5e27e9..36dd402fa7 100644 #include #include #include // for shared_array -diff --git a/hardware/ASyncTCP.cpp b/hardware/ASyncTCP.cpp -index 8990c24300..7f7b1e0f24 100644 --- a/hardware/ASyncTCP.cpp +++ b/hardware/ASyncTCP.cpp @@ -1,10 +1,12 @@ @@ -86,8 +82,6 @@ index 8990c24300..7f7b1e0f24 100644 struct hostent; #ifndef WIN32 -diff --git a/hardware/Comm5Serial.cpp b/hardware/Comm5Serial.cpp -index 9b44496fb5..f1c1f706d2 100644 --- a/hardware/Comm5Serial.cpp +++ b/hardware/Comm5Serial.cpp @@ -5,6 +5,8 @@ @@ -99,8 +93,6 @@ index 9b44496fb5..f1c1f706d2 100644 /* This driver allows Domoticz to control any I/O module from the MA-4xxx Family -diff --git a/hardware/CurrentCostMeterSerial.cpp b/hardware/CurrentCostMeterSerial.cpp -index 05bac73d6a..bf9d35cab7 100644 --- a/hardware/CurrentCostMeterSerial.cpp +++ b/hardware/CurrentCostMeterSerial.cpp @@ -10,10 +10,12 @@ @@ -117,8 +109,6 @@ index 05bac73d6a..bf9d35cab7 100644 // //Class CurrentCostMeterSerial // -diff --git a/hardware/DavisLoggerSerial.cpp b/hardware/DavisLoggerSerial.cpp -index 9c44539beb..44c9dbde5c 100644 --- a/hardware/DavisLoggerSerial.cpp +++ b/hardware/DavisLoggerSerial.cpp @@ -8,13 +8,15 @@ @@ -138,8 +128,6 @@ index 9c44539beb..44c9dbde5c 100644 #ifdef _DEBUG //#define DEBUG_DAVIS #endif -diff --git a/hardware/DenkoviUSBDevices.cpp b/hardware/DenkoviUSBDevices.cpp -index a7977d82c8..53a27e5583 100644 --- a/hardware/DenkoviUSBDevices.cpp +++ b/hardware/DenkoviUSBDevices.cpp @@ -5,6 +5,8 @@ @@ -151,8 +139,6 @@ index a7977d82c8..53a27e5583 100644 #define MAX_POLL_INTERVAL 3600*1000 #define DAE_IO_TYPE_RELAY 2 -diff --git a/hardware/EnOceanESP2.cpp b/hardware/EnOceanESP2.cpp -index f20ff9c0cb..fd08c55f63 100644 --- a/hardware/EnOceanESP2.cpp +++ b/hardware/EnOceanESP2.cpp @@ -8,7 +8,7 @@ @@ -173,8 +159,6 @@ index f20ff9c0cb..fd08c55f63 100644 #define ENOCEAN_RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/EnOceanESP3.cpp b/hardware/EnOceanESP3.cpp -index 6866eeb0d0..2afa0e1e36 100644 --- a/hardware/EnOceanESP3.cpp +++ b/hardware/EnOceanESP3.cpp @@ -8,7 +8,7 @@ @@ -195,8 +179,6 @@ index 6866eeb0d0..2afa0e1e36 100644 #if _DEBUG #define ENOCEAN_BUTTON_DEBUG #endif -diff --git a/hardware/EvohomeRadio.cpp b/hardware/EvohomeRadio.cpp -index 4da983538b..6ba97158cd 100644 --- a/hardware/EvohomeRadio.cpp +++ b/hardware/EvohomeRadio.cpp @@ -23,6 +23,9 @@ @@ -209,8 +191,6 @@ index 4da983538b..6ba97158cd 100644 extern std::string szUserDataFolder; -diff --git a/hardware/EvohomeSerial.cpp b/hardware/EvohomeSerial.cpp -index 4a54988291..c74cf576cc 100644 --- a/hardware/EvohomeSerial.cpp +++ b/hardware/EvohomeSerial.cpp @@ -7,6 +7,8 @@ @@ -222,8 +202,6 @@ index 4a54988291..c74cf576cc 100644 CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) : CEvohomeRadio(ID, UserContID) { -diff --git a/hardware/KMTronic433.cpp b/hardware/KMTronic433.cpp -index da81b20f9f..f9832a5a74 100644 --- a/hardware/KMTronic433.cpp +++ b/hardware/KMTronic433.cpp @@ -9,11 +9,13 @@ @@ -241,8 +219,6 @@ index da81b20f9f..f9832a5a74 100644 //#define DEBUG_KMTronic #define RETRY_DELAY 30 -diff --git a/hardware/KMTronicBase.cpp b/hardware/KMTronicBase.cpp -index b343108966..d9c45872b5 100644 --- a/hardware/KMTronicBase.cpp +++ b/hardware/KMTronicBase.cpp @@ -10,7 +10,7 @@ @@ -254,8 +230,6 @@ index b343108966..d9c45872b5 100644 #include -diff --git a/hardware/KMTronicSerial.cpp b/hardware/KMTronicSerial.cpp -index 4e07f2c37a..6240f941bd 100644 --- a/hardware/KMTronicSerial.cpp +++ b/hardware/KMTronicSerial.cpp @@ -10,12 +10,14 @@ @@ -274,8 +248,6 @@ index 4e07f2c37a..6240f941bd 100644 #define RETRY_DELAY 30 KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname) -diff --git a/hardware/MQTT.cpp b/hardware/MQTT.cpp -index 8de3671853..19750bb75b 100644 --- a/hardware/MQTT.cpp +++ b/hardware/MQTT.cpp @@ -11,6 +11,8 @@ @@ -287,8 +259,6 @@ index 8de3671853..19750bb75b 100644 #define RETRY_DELAY 30 #define CLIENTID "Domoticz" -diff --git a/hardware/Meteostick.cpp b/hardware/Meteostick.cpp -index 9793f4b57b..10da69d6e3 100644 --- a/hardware/Meteostick.cpp +++ b/hardware/Meteostick.cpp @@ -9,12 +9,14 @@ @@ -307,8 +277,6 @@ index 9793f4b57b..10da69d6e3 100644 #define RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp -index af976fba95..42bf58fad5 100644 --- a/hardware/MySensorsBase.cpp +++ b/hardware/MySensorsBase.cpp @@ -13,7 +13,7 @@ @@ -320,8 +288,6 @@ index af976fba95..42bf58fad5 100644 #include "../webserver/cWebem.h" #include -diff --git a/hardware/MySensorsSerial.cpp b/hardware/MySensorsSerial.cpp -index 44f8692d2b..42f3e05409 100644 --- a/hardware/MySensorsSerial.cpp +++ b/hardware/MySensorsSerial.cpp @@ -8,12 +8,14 @@ @@ -340,8 +306,6 @@ index 44f8692d2b..42f3e05409 100644 //#define DEBUG_MYSENSORS #define RETRY_DELAY 30 -diff --git a/hardware/OTGWBase.cpp b/hardware/OTGWBase.cpp -index 322574458b..ded3a31c2c 100644 --- a/hardware/OTGWBase.cpp +++ b/hardware/OTGWBase.cpp @@ -12,7 +12,7 @@ @@ -353,8 +317,6 @@ index 322574458b..ded3a31c2c 100644 #include #include -diff --git a/hardware/OTGWSerial.cpp b/hardware/OTGWSerial.cpp -index 4ade70e063..5a3416548f 100644 --- a/hardware/OTGWSerial.cpp +++ b/hardware/OTGWSerial.cpp @@ -8,12 +8,14 @@ @@ -373,8 +335,6 @@ index 4ade70e063..5a3416548f 100644 #define RETRY_DELAY 30 #define OTGW_READ_INTERVAL 10 -diff --git a/hardware/OpenWebNetUSB.cpp b/hardware/OpenWebNetUSB.cpp -index bf23049844..352a2220e9 100644 --- a/hardware/OpenWebNetUSB.cpp +++ b/hardware/OpenWebNetUSB.cpp @@ -19,11 +19,12 @@ License: Public domain @@ -391,8 +351,6 @@ index bf23049844..352a2220e9 100644 COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate) { -diff --git a/hardware/P1MeterSerial.cpp b/hardware/P1MeterSerial.cpp -index 566b451fa5..7dc3e0782e 100644 --- a/hardware/P1MeterSerial.cpp +++ b/hardware/P1MeterSerial.cpp @@ -14,10 +14,12 @@ @@ -409,8 +367,6 @@ index 566b451fa5..7dc3e0782e 100644 #ifdef _DEBUG //#define DEBUG_P1_R #endif -diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp -index d3e2fda942..b6dc78a786 100644 --- a/hardware/Pinger.cpp +++ b/hardware/Pinger.cpp @@ -19,6 +19,8 @@ @@ -422,8 +378,6 @@ index d3e2fda942..b6dc78a786 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/RAVEn.cpp b/hardware/RAVEn.cpp -index d9efc7480a..b6a4399d04 100644 --- a/hardware/RAVEn.cpp +++ b/hardware/RAVEn.cpp @@ -8,6 +8,8 @@ @@ -435,8 +389,6 @@ index d9efc7480a..b6a4399d04 100644 //Rainforest RAVEn USB ZigBee Smart Meter Adapter //https://rainforestautomation.com/rfa-z106-raven/ -diff --git a/hardware/RFLinkSerial.cpp b/hardware/RFLinkSerial.cpp -index c5cae0f739..4ab07ed88e 100644 --- a/hardware/RFLinkSerial.cpp +++ b/hardware/RFLinkSerial.cpp @@ -5,6 +5,8 @@ @@ -448,8 +400,6 @@ index c5cae0f739..4ab07ed88e 100644 CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) : m_szSerialPort(devname) { -diff --git a/hardware/RFXComSerial.cpp b/hardware/RFXComSerial.cpp -index dc85f4832d..4c39520510 100644 --- a/hardware/RFXComSerial.cpp +++ b/hardware/RFXComSerial.cpp @@ -12,7 +12,7 @@ @@ -470,8 +420,6 @@ index dc85f4832d..4c39520510 100644 #define RETRY_DELAY 30 #define RFX_WRITE_DELAY 300 -diff --git a/hardware/RFXComTCP.cpp b/hardware/RFXComTCP.cpp -index 7c6b3954b8..0e4856fbfb 100644 --- a/hardware/RFXComTCP.cpp +++ b/hardware/RFXComTCP.cpp @@ -1,8 +1,6 @@ @@ -483,8 +431,6 @@ index 7c6b3954b8..0e4856fbfb 100644 #include "../main/Helper.h" #include "../main/localtime_r.h" #include "../main/mainworker.h" -diff --git a/hardware/Rego6XXSerial.cpp b/hardware/Rego6XXSerial.cpp -index b94bd291bc..15d22f869a 100644 --- a/hardware/Rego6XXSerial.cpp +++ b/hardware/Rego6XXSerial.cpp @@ -16,11 +16,13 @@ @@ -502,8 +448,6 @@ index b94bd291bc..15d22f869a 100644 #define Rego6XX_RETRY_DELAY 30 #define Rego6XX_COMMAND_DELAY 5 #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1) -diff --git a/hardware/S0MeterBase.cpp b/hardware/S0MeterBase.cpp -index 9cffa67022..75a06e2cc1 100644 --- a/hardware/S0MeterBase.cpp +++ b/hardware/S0MeterBase.cpp @@ -13,7 +13,7 @@ @@ -515,8 +459,6 @@ index 9cffa67022..75a06e2cc1 100644 #include -diff --git a/hardware/S0MeterSerial.cpp b/hardware/S0MeterSerial.cpp -index 1dc16b2b3e..f474d1c766 100644 --- a/hardware/S0MeterSerial.cpp +++ b/hardware/S0MeterSerial.cpp @@ -8,11 +8,13 @@ @@ -534,8 +476,6 @@ index 1dc16b2b3e..f474d1c766 100644 #ifdef _DEBUG //#define DEBUG_S0 #define TOT_DEBUG_LINES 6 -diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp -index 60445d9c28..82ba3559d9 100644 --- a/hardware/TCPProxy/tcpproxy_server.cpp +++ b/hardware/TCPProxy/tcpproxy_server.cpp @@ -15,6 +15,8 @@ @@ -547,8 +487,6 @@ index 60445d9c28..82ba3559d9 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/TeleinfoSerial.cpp b/hardware/TeleinfoSerial.cpp -index 85f9a6240f..fa794802e9 100644 --- a/hardware/TeleinfoSerial.cpp +++ b/hardware/TeleinfoSerial.cpp @@ -28,9 +28,11 @@ History : @@ -564,8 +502,6 @@ index 85f9a6240f..fa794802e9 100644 CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit) { m_HwdID = ID; -diff --git a/hardware/USBtin.cpp b/hardware/USBtin.cpp -index c3e3656319..ce6f542df3 100644 --- a/hardware/USBtin.cpp +++ b/hardware/USBtin.cpp @@ -27,7 +27,7 @@ History : @@ -586,8 +522,6 @@ index c3e3656319..ce6f542df3 100644 #define USBTIN_BAUD_RATE 115200 #define USBTIN_PARITY boost::asio::serial_port_base::parity::none #define USBTIN_CARACTER_SIZE 8 -diff --git a/hardware/XiaomiGateway.cpp b/hardware/XiaomiGateway.cpp -index f4567ec62f..e4998faa6a 100644 --- a/hardware/XiaomiGateway.cpp +++ b/hardware/XiaomiGateway.cpp @@ -12,7 +12,7 @@ @@ -599,8 +533,6 @@ index f4567ec62f..e4998faa6a 100644 #ifndef WIN32 #include -diff --git a/hardware/Yeelight.h b/hardware/Yeelight.h -index b063f79743..64fd6f5479 100644 --- a/hardware/Yeelight.h +++ b/hardware/Yeelight.h @@ -2,7 +2,6 @@ @@ -611,8 +543,6 @@ index b063f79743..64fd6f5479 100644 class Yeelight : public CDomoticzHardwareBase { -diff --git a/hardware/ZiBlueSerial.cpp b/hardware/ZiBlueSerial.cpp -index 9e9db2aff1..8e896897fc 100644 --- a/hardware/ZiBlueSerial.cpp +++ b/hardware/ZiBlueSerial.cpp @@ -6,6 +6,8 @@ @@ -624,8 +554,6 @@ index 9e9db2aff1..8e896897fc 100644 #define ZiBlue_RETRY_DELAY 30 CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) : -diff --git a/hardware/plugins/PluginTransports.cpp b/hardware/plugins/PluginTransports.cpp -index c7e065529f..7fc1cb953e 100644 --- a/hardware/plugins/PluginTransports.cpp +++ b/hardware/plugins/PluginTransports.cpp @@ -13,6 +13,8 @@ @@ -637,8 +565,6 @@ index c7e065529f..7fc1cb953e 100644 namespace Plugins { void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) -diff --git a/main/WebServer.cpp b/main/WebServer.cpp -index 0a19319669..ed92f06e32 100644 --- a/main/WebServer.cpp +++ b/main/WebServer.cpp @@ -1,7 +1,7 @@ @@ -659,8 +585,6 @@ index 0a19319669..ed92f06e32 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/main/mainworker.cpp b/main/mainworker.cpp -index 505f59f49d..5fb2ee9042 100644 --- a/main/mainworker.cpp +++ b/main/mainworker.cpp @@ -174,6 +174,8 @@ @@ -672,8 +596,6 @@ index 505f59f49d..5fb2ee9042 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/push/FibaroPush.cpp b/push/FibaroPush.cpp -index 0bc54e6cfd..350a8fa893 100644 --- a/push/FibaroPush.cpp +++ b/push/FibaroPush.cpp @@ -14,6 +14,8 @@ @@ -685,8 +607,6 @@ index 0bc54e6cfd..350a8fa893 100644 CFibaroPush::CFibaroPush() { m_PushType = PushType::PUSHTYPE_FIBARO; -diff --git a/push/GooglePubSubPush.cpp b/push/GooglePubSubPush.cpp -index 6d0fc82d40..a5b720f219 100644 --- a/push/GooglePubSubPush.cpp +++ b/push/GooglePubSubPush.cpp @@ -21,6 +21,8 @@ extern "C" { @@ -698,8 +618,6 @@ index 6d0fc82d40..a5b720f219 100644 extern std::string szUserDataFolder; // this should be filled in by the preprocessor -diff --git a/push/HttpPush.cpp b/push/HttpPush.cpp -index 8132ca2b43..3d1d51d52e 100644 --- a/push/HttpPush.cpp +++ b/push/HttpPush.cpp @@ -15,6 +15,8 @@ @@ -711,8 +629,6 @@ index 8132ca2b43..3d1d51d52e 100644 CHttpPush::CHttpPush() { m_PushType = PushType::PUSHTYPE_HTTP; -diff --git a/push/InfluxPush.cpp b/push/InfluxPush.cpp -index 0a8e99414f..745fdf0496 100644 --- a/push/InfluxPush.cpp +++ b/push/InfluxPush.cpp @@ -15,6 +15,8 @@ @@ -724,8 +640,6 @@ index 0a8e99414f..745fdf0496 100644 CInfluxPush::CInfluxPush() : m_InfluxPort(8086), m_bInfluxDebugActive(false) -diff --git a/push/WebsocketPush.cpp b/push/WebsocketPush.cpp -index 0fb71f96ec..3c2ce7ed54 100644 --- a/push/WebsocketPush.cpp +++ b/push/WebsocketPush.cpp @@ -3,6 +3,8 @@ @@ -737,8 +651,6 @@ index 0fb71f96ec..3c2ce7ed54 100644 extern boost::signals2::signal sOnNotificationReceived; -diff --git a/tcpserver/TCPServer.cpp b/tcpserver/TCPServer.cpp -index d3b0a94847..3b8d0b9b76 100644 --- a/tcpserver/TCPServer.cpp +++ b/tcpserver/TCPServer.cpp @@ -11,7 +11,7 @@ @@ -750,8 +662,6 @@ index d3b0a94847..3b8d0b9b76 100644 namespace tcp { namespace server { -diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp -index f015be097f..63c96f789f 100644 --- a/webserver/cWebem.cpp +++ b/webserver/cWebem.cpp @@ -5,7 +5,7 @@ @@ -763,8 +673,6 @@ index f015be097f..63c96f789f 100644 #include "reply.hpp" #include "request.hpp" #include "mime_types.hpp" -diff --git a/webserver/connection.cpp b/webserver/connection.cpp -index d3485fe923..afe700e5d7 100644 --- a/webserver/connection.cpp +++ b/webserver/connection.cpp @@ -9,7 +9,7 @@ @@ -785,8 +693,6 @@ index d3485fe923..afe700e5d7 100644 namespace http { namespace server { extern std::string convert_to_http_date(time_t time); -diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp -index b6c20de53f..bf1d9882d0 100644 --- a/webserver/connection_manager.cpp +++ b/webserver/connection_manager.cpp @@ -10,10 +10,12 @@ @@ -803,8 +709,6 @@ index b6c20de53f..bf1d9882d0 100644 namespace http { namespace server { -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index c2bcd3178f..423ee0fb4b 100644 --- a/webserver/proxyclient.cpp +++ b/webserver/proxyclient.cpp @@ -8,6 +8,8 @@ @@ -816,8 +720,6 @@ index c2bcd3178f..423ee0fb4b 100644 // RK: some defines to make mydomoticz also work when openssl not compiled in #ifdef WWW_ENABLE_SSL #define PROXY_PORT 443 -diff --git a/webserver/server.cpp b/webserver/server.cpp -index 1eb2137ef2..6025b1cdb5 100644 --- a/webserver/server.cpp +++ b/webserver/server.cpp @@ -3,7 +3,7 @@ diff --git a/utils/domoticz/patches/011-openzwave-include.patch b/utils/domoticz/patches/011-openzwave-include.patch index ce0af4bfa3..1792b5cb6c 100644 --- a/utils/domoticz/patches/011-openzwave-include.patch +++ b/utils/domoticz/patches/011-openzwave-include.patch @@ -37,8 +37,6 @@ Tested with both static and dynamic builds of OpenZWave. hardware/openzwave/control_panel/ozwcp.h | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa5b3099d..1f4b6fb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -694,6 +694,7 @@ endif(WITH_LIBUSB) @@ -69,8 +67,6 @@ index fa5b3099d..1f4b6fb57 100644 endif (OPENZWAVE_INCLUDE_DIRS) add_definitions(-DWITH_OPENZWAVE) ELSE() -diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp -index 272e3d0a7..a226a8924 100644 --- a/hardware/OpenZWave.cpp +++ b/hardware/OpenZWave.cpp @@ -22,10 +22,10 @@ @@ -88,8 +84,6 @@ index 272e3d0a7..a226a8924 100644 #include "ZWaveCommands.h" -diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp -index 0b21a9cf3..5e401b2f1 100644 --- a/hardware/openzwave/control_panel/ozwcp.cpp +++ b/hardware/openzwave/control_panel/ozwcp.cpp @@ -39,11 +39,11 @@ @@ -109,8 +103,6 @@ index 0b21a9cf3..5e401b2f1 100644 #include "../../../main/Logger.h" #include -diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h -index ebfef1791..96d14b3bf 100644 --- a/hardware/openzwave/control_panel/ozwcp.h +++ b/hardware/openzwave/control_panel/ozwcp.h @@ -38,8 +38,8 @@ @@ -124,6 +116,3 @@ index ebfef1791..96d14b3bf 100644 #define MAX_NODES 255 --- -2.26.2 - diff --git a/utils/domoticz/patches/012-minizip-overflow.patch b/utils/domoticz/patches/012-minizip-overflow.patch index f5b41e6679..8c26ede432 100644 --- a/utils/domoticz/patches/012-minizip-overflow.patch +++ b/utils/domoticz/patches/012-minizip-overflow.patch @@ -28,8 +28,6 @@ Reduce the buffer size to 65535 bytes instead. main/unzip_stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/main/unzip_stream.h b/main/unzip_stream.h -index 136fcefd9..813f2489a 100644 --- a/main/unzip_stream.h +++ b/main/unzip_stream.h @@ -135,7 +135,7 @@ namespace clx { @@ -41,6 +39,3 @@ index 136fcefd9..813f2489a 100644 unz_file_info info; unzGetCurrentFileInfo(handler_, &info, path, sizeof(path), NULL, 0, NULL, 0); path_ = path; --- -2.26.2 - diff --git a/utils/dosfstools/patches/010-iconv.patch b/utils/dosfstools/patches/010-iconv.patch index 04d402bf3b..f594285d3a 100644 --- a/utils/dosfstools/patches/010-iconv.patch +++ b/utils/dosfstools/patches/010-iconv.patch @@ -10,11 +10,9 @@ Added check for libiconv_open as that can be used when the libc lacks iconv. configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 07e8703..1b09964 100644 --- a/configure.ac +++ b/configure.ac -@@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then +@@ -59,7 +59,8 @@ if test "x$with_udev" != "xno"; then [true]) fi diff --git a/utils/evtest/patches/010-musl.patch b/utils/evtest/patches/010-musl.patch index 92260297c3..647c9dc540 100644 --- a/utils/evtest/patches/010-musl.patch +++ b/utils/evtest/patches/010-musl.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Add missing include of limits.h for PATH_MAX evtest.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/evtest.c b/evtest.c -index 548c203..be5e42c 100644 --- a/evtest.c +++ b/evtest.c @@ -59,6 +59,7 @@ @@ -19,6 +17,3 @@ index 548c203..be5e42c 100644 #define BITS_PER_LONG (sizeof(long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) --- -2.22.0 - diff --git a/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 1473ba7433..3fcb252247 100644 --- a/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -13,11 +13,9 @@ Signed-off-by: Khem Raj evtest.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/evtest.c b/evtest.c -index be5e42c..d00437f 100644 --- a/evtest.c +++ b/evtest.c -@@ -62,6 +62,11 @@ +@@ -61,6 +61,11 @@ #include #include /* PATH_MAX */ @@ -29,7 +27,7 @@ index be5e42c..d00437f 100644 #define BITS_PER_LONG (sizeof(long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) #define OFF(x) ((x)%BITS_PER_LONG) -@@ -1141,7 +1146,7 @@ static int print_events(int fd) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) type = ev[i].type; code = ev[i].code; @@ -38,6 +36,3 @@ index be5e42c..d00437f 100644 if (type == EV_SYN) { if (code == SYN_MT_REPORT) --- -2.25.1 - diff --git a/utils/flashrom/patches/010-bitbang.patch b/utils/flashrom/patches/010-bitbang.patch index 33579f19b7..b5ff7cd3bf 100644 --- a/utils/flashrom/patches/010-bitbang.patch +++ b/utils/flashrom/patches/010-bitbang.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', la +@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSIO config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') config_atavia = get_option('config_atavia') @@ -10,7 +10,7 @@ config_dediprog = get_option('config_dediprog') --- a/meson_options.txt +++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : true, description : 'use libusb1') +@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory') diff --git a/utils/gddrescue/patches/001-fix_uclibc.patch b/utils/gddrescue/patches/001-fix_uclibc.patch index 05113a82cc..c516d2cae3 100644 --- a/utils/gddrescue/patches/001-fix_uclibc.patch +++ b/utils/gddrescue/patches/001-fix_uclibc.patch @@ -25,4 +25,4 @@ +#include #include #include - #include \ No newline at end of file + #include diff --git a/utils/haserl/patches/100-replace-lua2c-with-sed.patch b/utils/haserl/patches/100-replace-lua2c-with-sed.patch index 4626a0289e..622995edd0 100644 --- a/utils/haserl/patches/100-replace-lua2c-with-sed.patch +++ b/utils/haserl/patches/100-replace-lua2c-with-sed.patch @@ -1,5 +1,3 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 31d45f7..d249f67 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,7 +86,6 @@ POST_INSTALL = : @@ -40,7 +38,7 @@ index 31d45f7..d249f67 100644 # Not strictly required, but we explicitly do not distribute the generated inc file nodist_haserl_SOURCES = haserl_lualib.inc -@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE +@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(has @rm -f haserl$(EXEEXT) $(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS) diff --git a/utils/haserl/patches/101-adjust-script-size.patch b/utils/haserl/patches/101-adjust-script-size.patch index a4b7d9a4db..1c4da25311 100644 --- a/utils/haserl/patches/101-adjust-script-size.patch +++ b/utils/haserl/patches/101-adjust-script-size.patch @@ -1,6 +1,6 @@ ---- a/src/h_lua_common.c 2013-09-20 23:35:19.000000000 +0300 -+++ b/src/h_lua_common.c 2014-05-03 19:27:43.000000000 +0300 -@@ -79,7 +79,7 @@ +--- a/src/h_lua_common.c ++++ b/src/h_lua_common.c +@@ -79,7 +79,7 @@ lua_common_setup (char *shell, list_t * /* and load our haserl library */ if (luaL_loadbuffer diff --git a/utils/hwinfo/patches/0-hardcoding-version b/utils/hwinfo/patches/0-hardcoding-version index 6986f67961..96f85fd99c 100644 --- a/utils/hwinfo/patches/0-hardcoding-version +++ b/utils/hwinfo/patches/0-hardcoding-version @@ -1,8 +1,8 @@ hardcode version of hwinfo, this must be changed in sync with hwinfo version changes when updating the package ---- a/Makefile -+++ b/Makefile -@@ -12,12 +12,8 @@ +--- a/Makefile ++++ b/Makefile +@@ -12,12 +12,8 @@ export SO_LIBS GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) diff --git a/utils/lcdproc/patches/100-remove-build-timestamp.patch b/utils/lcdproc/patches/100-remove-build-timestamp.patch index 33f2c5707b..1c6c84dccd 100644 --- a/utils/lcdproc/patches/100-remove-build-timestamp.patch +++ b/utils/lcdproc/patches/100-remove-build-timestamp.patch @@ -1,8 +1,6 @@ -Index: lcdproc-0.5.9/clients/lcdproc/main.c -=================================================================== ---- lcdproc-0.5.9.orig/clients/lcdproc/main.c 2017-04-21 12:43:48.000000000 +0200 -+++ lcdproc-0.5.9/clients/lcdproc/main.c 2017-12-06 23:36:54.674753530 +0100 -@@ -58,7 +58,6 @@ +--- a/clients/lcdproc/main.c ++++ b/clients/lcdproc/main.c +@@ -58,7 +58,6 @@ int Quit = 0; int sock = -1; char *version = VERSION; @@ -10,10 +8,8 @@ Index: lcdproc-0.5.9/clients/lcdproc/main.c int lcd_wid = 0; int lcd_hgt = 0; -Index: lcdproc-0.5.9/server/main.c -=================================================================== ---- lcdproc-0.5.9.orig/server/main.c 2017-04-24 22:17:15.000000000 +0200 -+++ lcdproc-0.5.9/server/main.c 2017-12-06 23:36:47.550605856 +0100 +--- a/server/main.c ++++ b/server/main.c @@ -104,7 +104,6 @@ char *version = VERSION; char *protocol_version = PROTOCOL_VERSION; @@ -22,7 +18,7 @@ Index: lcdproc-0.5.9/server/main.c /**** Configuration variables ****/ -@@ -197,8 +196,8 @@ +@@ -197,8 +196,8 @@ main(int argc, char **argv) /* Report that server is starting (report will be delayed) */ report(RPT_NOTICE, "LCDd version %s starting", version); diff --git a/utils/lcdproc/patches/110-in-outb.patch b/utils/lcdproc/patches/110-in-outb.patch index 7bf34eb303..cd87e18a6b 100644 --- a/utils/lcdproc/patches/110-in-outb.patch +++ b/utils/lcdproc/patches/110-in-outb.patch @@ -1,6 +1,6 @@ --- a/server/drivers/port.h +++ b/server/drivers/port.h -@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count); +@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns /* ---------------------------- Linux ------------------------------------ */ /* Use ioperm, inb and outb in (Linux) */ /* And iopl for higher addresses of PCI LPT cards */ diff --git a/utils/lrzsz/patches/100-install_delete_fix.patch b/utils/lrzsz/patches/100-install_delete_fix.patch index 3b19443bde..7f3995d519 100644 --- a/utils/lrzsz/patches/100-install_delete_fix.patch +++ b/utils/lrzsz/patches/100-install_delete_fix.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -372,13 +372,13 @@ +@@ -372,13 +372,13 @@ install-exec-local: rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch index 3b5b524243..ec1e2f90d7 100644 --- a/utils/lvm2/patches/002-const-stdio.patch +++ b/utils/lvm2/patches/002-const-stdio.patch @@ -20,7 +20,7 @@ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3241,6 +3241,7 @@ int lvm_split(char *str, int *argc, char +@@ -3235,6 +3235,7 @@ int lvm_split(char *str, int *argc, char /* Make sure we have always valid filedescriptors 0,1,2 */ static int _check_standard_fds(void) { @@ -28,7 +28,7 @@ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && -@@ -3267,6 +3268,12 @@ static int _check_standard_fds(void) +@@ -3261,6 +3262,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; } diff --git a/utils/lvm2/patches/003-no-mallinfo.patch b/utils/lvm2/patches/003-no-mallinfo.patch index 8f7f25d1d3..e46ead5da6 100644 --- a/utils/lvm2/patches/003-no-mallinfo.patch +++ b/utils/lvm2/patches/003-no-mallinfo.patch @@ -1,6 +1,6 @@ --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c -@@ -183,12 +183,15 @@ static void _allocate_memory(void) +@@ -187,12 +187,15 @@ static void _allocate_memory(void) * memory on free(), this is good enough for our purposes. */ while (missing > 0) { @@ -16,7 +16,7 @@ inf = mallinfo(); if (hblks < inf.hblks) { -@@ -198,9 +201,12 @@ static void _allocate_memory(void) +@@ -202,9 +205,12 @@ static void _allocate_memory(void) free(areas[area]); _size_malloc_tmp /= 2; } else { @@ -29,7 +29,7 @@ if (area == max_areas && missing > 0) { /* Too bad. Warn the user and proceed, as things are -@@ -521,8 +527,13 @@ static void _lock_mem(struct cmd_context +@@ -525,8 +531,13 @@ static void _lock_mem(struct cmd_context * will not block memory locked thread * Note: assuming _memlock_count_daemon is updated before _memlock_count */ diff --git a/utils/macchanger/patches/0001-fix-build-with-musl.patch b/utils/macchanger/patches/0001-fix-build-with-musl.patch index 4a30d55100..23fa5600d9 100644 --- a/utils/macchanger/patches/0001-fix-build-with-musl.patch +++ b/utils/macchanger/patches/0001-fix-build-with-musl.patch @@ -1,7 +1,5 @@ -Index: macchanger-1.7.0/src/netinfo.c -=================================================================== ---- macchanger-1.7.0.orig/src/netinfo.c -+++ macchanger-1.7.0/src/netinfo.c +--- a/src/netinfo.c ++++ b/src/netinfo.c @@ -113,7 +113,7 @@ mc_net_info_get_permanent_mac (const net epa->size = IFHWADDRLEN; diff --git a/utils/mariadb/patches/100-fix_hostname.patch b/utils/mariadb/patches/100-fix_hostname.patch index 1e20f4f928..0a64dc6f3b 100644 --- a/utils/mariadb/patches/100-fix_hostname.patch +++ b/utils/mariadb/patches/100-fix_hostname.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -419,7 +419,7 @@ fi +@@ -418,7 +418,7 @@ fi # Try to determine the hostname diff --git a/utils/mariadb/patches/130-c11_atomics.patch b/utils/mariadb/patches/130-c11_atomics.patch index 4c486af619..11c834d692 100644 --- a/utils/mariadb/patches/130-c11_atomics.patch +++ b/utils/mariadb/patches/130-c11_atomics.patch @@ -9,7 +9,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200 --- a/configure.cmake +++ b/configure.cmake -@@ -866,7 +866,25 @@ int main() +@@ -863,7 +863,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -38,8 +38,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200 SET(HAVE_valgrind 1) --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -79,6 +79,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) +@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings + ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -51,7 +51,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200 ENDIF(HAVE_BFD_H) --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -190,6 +190,10 @@ ELSE() +@@ -191,6 +191,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() diff --git a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch index fd5958d438..46431d36f4 100644 --- a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch +++ b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch @@ -1,7 +1,5 @@ -Index: mariadb-10.4.17/include/my_cpu.h -=================================================================== ---- mariadb-10.4.17.orig/include/my_cpu.h -+++ mariadb-10.4.17/include/my_cpu.h +--- a/include/my_cpu.h ++++ b/include/my_cpu.h @@ -24,17 +24,16 @@ */ @@ -34,10 +32,8 @@ Index: mariadb-10.4.17/include/my_cpu.h #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ __asm__ __volatile__ ("":::"memory"); -Index: mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h -=================================================================== ---- mariadb-10.4.17.orig/storage/tokudb/PerconaFT/portability/toku_time.h -+++ mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h +--- a/storage/tokudb/PerconaFT/portability/toku_time.h ++++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); return result; diff --git a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch index 497630711e..5a2c30dcf1 100644 --- a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch +++ b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -359,6 +359,14 @@ then +@@ -358,6 +358,14 @@ then exit 1 fi plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin` @@ -15,7 +15,7 @@ pamtooldir=$plugindir # relative from where the script was run for a relocatable install elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" -@@ -478,7 +486,9 @@ do +@@ -477,7 +485,9 @@ do fi done @@ -26,7 +26,7 @@ then if test -z "$srcdir" -a "$in_rpm" -eq 0 then -@@ -499,6 +509,10 @@ then +@@ -498,6 +508,10 @@ then echo fi fi diff --git a/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch b/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch index 6371628e08..8b74e0308f 100644 --- a/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch +++ b/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch @@ -1,6 +1,6 @@ --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh -@@ -242,7 +242,7 @@ wsrep_recover_position() { +@@ -244,7 +244,7 @@ wsrep_recover_position() { return 1 fi @@ -9,7 +9,7 @@ local wr_options="--disable-log-error --pid-file='$wr_pidfile'" -@@ -673,7 +673,7 @@ then +@@ -664,7 +664,7 @@ then * ) err_log="$DATADIR/$err_log" ;; esac else @@ -18,7 +18,7 @@ fi fi -@@ -752,7 +752,7 @@ fi +@@ -743,7 +743,7 @@ fi if test -z "$pid_file" then diff --git a/utils/mbtools/patches/010-glib.patch b/utils/mbtools/patches/010-glib.patch index 1f2836becb..0da203c816 100644 --- a/utils/mbtools/patches/010-glib.patch +++ b/utils/mbtools/patches/010-glib.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -21,7 +21,7 @@ AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h]) +@@ -21,7 +21,7 @@ AC_CHECK_HEADERS([stdio.h stdlib.h strin MBTOOLS_REQUIRES="glib-2.0 >= 2.10.0 libmodbus >= 3.1.0" PKG_CHECK_MODULES(MBTOOLS_DEPS, [$MBTOOLS_REQUIRES]) diff --git a/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch b/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch index 1ad7c123ac..eb89881b06 100644 --- a/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch +++ b/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch @@ -1,7 +1,5 @@ -Index: mbtools-2014-10-29/tests/unit-test-server.c -=================================================================== ---- mbtools-2014-10-29.orig/tests/unit-test-server.c -+++ mbtools-2014-10-29/tests/unit-test-server.c +--- a/tests/unit-test-server.c ++++ b/tests/unit-test-server.c @@ -117,4 +117,5 @@ int main(int argc, char *argv[]) } printf("Quit the loop: %s\n", modbus_strerror(errno)); diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch index 73d8ca9491..a6e07aefc0 100644 --- a/utils/mc/patches/010-subshell.patch +++ b/utils/mc/patches/010-subshell.patch @@ -1,4 +1,4 @@ --- a/src/subshell/common.c +--- a/src/subshell/common.c +++ b/src/subshell/common.c @@ -836,7 +836,7 @@ init_subshell_precmd (char *precmd, size "else " diff --git a/utils/mg/patches/001-cross_compile_openwrt.patch b/utils/mg/patches/001-cross_compile_openwrt.patch index 3789bef29a..756135654a 100644 --- a/utils/mg/patches/001-cross_compile_openwrt.patch +++ b/utils/mg/patches/001-cross_compile_openwrt.patch @@ -68,7 +68,7 @@ fparselncheck() { cat << EOF > conftest.c -@@ -229,20 +170,6 @@ +@@ -229,20 +170,6 @@ EOF fi } @@ -89,7 +89,7 @@ # Option variables if [ ! -z "$PREFIX" ] ; then prefix="$PREFIX" -@@ -327,79 +254,9 @@ +@@ -327,79 +254,9 @@ if [ $static -ne 0 ] ; then ldflags="${ldflags}-static" fi diff --git a/utils/minicom/patches/200-gcc10.patch b/utils/minicom/patches/200-gcc10.patch index 6c36c619cc..987e16e1a3 100644 --- a/utils/minicom/patches/200-gcc10.patch +++ b/utils/minicom/patches/200-gcc10.patch @@ -1,6 +1,6 @@ --- a/src/minicom.h +++ b/src/minicom.h -@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use. */ +@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use EXTERN char *dial_name; /* System we're conneced to */ EXTERN char *dial_number; /* Number we've dialed. */ @@ -19,7 +19,7 @@ #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ ? -1 : portfd) #else -@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ +@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Ba EXTERN int st_attr; /* Status Bar attributes. */ /* jl 04.09.97 conversion tables */ diff --git a/utils/mksh/patches/100-dot_mkshrc b/utils/mksh/patches/100-dot_mkshrc index 45c6cbd4d5..1debb44640 100644 --- a/utils/mksh/patches/100-dot_mkshrc +++ b/utils/mksh/patches/100-dot_mkshrc @@ -32,7 +32,7 @@ Signed-off-by: Alif M. A. --- a/dot.mkshrc +++ b/dot.mkshrc -@@ -64,9 +64,9 @@ +@@ -64,9 +64,9 @@ for EDITOR in "${EDITOR:-}" jupp jstar m EDITOR= done diff --git a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch index 1e9e295acf..36ea88ccb0 100644 --- a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch +++ b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch @@ -11,11 +11,9 @@ Acked-by: Avri Altman lsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lsmmc.c b/lsmmc.c -index 4f687ac..b627b79 100644 --- a/lsmmc.c +++ b/lsmmc.c -@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config unsigned int crc; parse_bin(cid, "8u6r2u8u48a4u4u32u4u4u7u1r", @@ -24,6 +22,3 @@ index 4f687ac..b627b79 100644 &mdt_year, &mdt_month, &crc); pnm[6] = '\0'; --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch index ba97e79f64..6ccf2e5ba4 100644 --- a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch +++ b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch @@ -12,8 +12,6 @@ Signed-off-by: Stephane Fillod lsmmc.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index b627b79..63504d2 100644 --- a/lsmmc.c +++ b/lsmmc.c @@ -112,7 +112,7 @@ struct ids_database database[] = { @@ -34,36 +32,34 @@ index b627b79..63504d2 100644 }, { .type = "sd", -@@ -134,6 +134,11 @@ struct ids_database database[] = { - .id = 0x1f, - .manufacturer = "Kingston", +@@ -136,6 +136,11 @@ struct ids_database database[] = { }, -+ { -+ .type = "sd", + { + .type = "sd", + .id = 0x27, + .manufacturer = "Delkin/Phison", + }, - { - .type = "sd", - .id = 0x28, -@@ -144,6 +149,11 @@ struct ids_database database[] = { - .id = 0x30, - .manufacturer = "SanDisk", - }, + { + .type = "sd", + .id = 0x28, + .manufacturer = "Lexar", + }, +@@ -146,6 +151,11 @@ struct ids_database database[] = { + }, + { + .type = "sd", + .id = 0x31, + .manufacturer = "Silicon Power", + }, - { - .type = "sd", - .id = 0x33, -@@ -159,6 +169,21 @@ struct ids_database database[] = { - .id = 0x6f, - .manufacturer = "STMicroelectronics", - }, + { + .type = "sd", + .id = 0x33, + .manufacturer = "STMicroelectronics", + }, +@@ -161,6 +171,21 @@ struct ids_database database[] = { + }, + { + .type = "sd", + .id = 0x74, + .manufacturer = "Transcend", + }, @@ -77,9 +73,11 @@ index b627b79..63504d2 100644 + .id = 0x82, + .manufacturer = "Gobe/Sony", + }, - { - .type = "sd", ++ { ++ .type = "sd", .id = 0x89, + .manufacturer = "Unknown", + }, @@ -224,6 +249,11 @@ struct ids_database database[] = { .id = 0x70, .manufacturer = "Kingston", @@ -92,6 +90,3 @@ index b627b79..63504d2 100644 }; /* Command line parsing functions */ --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0008-Various-fixes.patch b/utils/mmc-utils/patches/0008-Various-fixes.patch index f680350f86..f3ea6a73d2 100644 --- a/utils/mmc-utils/patches/0008-Various-fixes.patch +++ b/utils/mmc-utils/patches/0008-Various-fixes.patch @@ -12,11 +12,9 @@ Reviewed-by: Michael Heimpold mmc_cmds.c | 14 ++++++++++++-- 2 files changed, 33 insertions(+), 23 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index 63504d2..06cc0b8 100644 --- a/lsmmc.c +++ b/lsmmc.c -@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config, char *cid) +@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config, printf("\tOID: %s\n", oid); printf("\tPNM: %s\n", pnm); printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor); @@ -28,7 +26,7 @@ index 63504d2..06cc0b8 100644 2000 + mdt_year, months[mdt_month]); printf("\tCRC: 0x%02x\n", crc); } else { -@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config, char *cid) +@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config, else printf("manufacturer: 'Unlisted' '%s'\n", oid); @@ -40,7 +38,7 @@ index 63504d2..06cc0b8 100644 months[mdt_month]); } } -@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config printf("\tOID: 0x%01x\n", oid); printf("\tPNM: %s\n", pnm); printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor); @@ -52,7 +50,7 @@ index 63504d2..06cc0b8 100644 1997 + mdt_year, months[mdt_month]); printf("\tCRC: 0x%02x\n", crc); } else { -@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config else printf("manufacturer: 'Unlisted' '%c'\n", oid); @@ -64,7 +62,7 @@ index 63504d2..06cc0b8 100644 months[mdt_month]); } } -@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config, printf("======SD/CSD======\n"); @@ -73,7 +71,7 @@ index 63504d2..06cc0b8 100644 printf("\tTAAC: 0x%02x (", taac); switch (taac_timevalue) { -@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config, if (csd_structure == 1 && taac != 0x0e) printf("Warn: Invalid TAAC (should be 0x0e)\n"); @@ -82,7 +80,7 @@ index 63504d2..06cc0b8 100644 if (csd_structure == 1 && nsac != 0x00) printf("Warn: Invalid NSAC (should be 0x00)\n"); -@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config, if (erase_blk_en != 0x01) printf("Warn: Invalid ERASE_BLK_EN (should be 0x01)\n"); @@ -97,7 +95,7 @@ index 63504d2..06cc0b8 100644 wp_grp_size, wp_grp_size + 1); if (wp_grp_size != 0x00) printf("Warn: Invalid WP_GRP_SIZE (should be 0x00)\n"); -@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config, if (wp_grp_enable != 0x00) printf("Warn: Invalid WP_GRP_ENABLE (should be 0x00)\n"); @@ -106,7 +104,7 @@ index 63504d2..06cc0b8 100644 r2w_factor, r2w_factor); if (r2w_factor != 0x02) printf("Warn: Invalid R2W_FACTOR (should be 0x02)\n"); -@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config, else printf("%.2fbyte", memory_capacity * 1.0); @@ -115,7 +113,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } else { unsigned long long blocks = 0; -@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config, else printf("%.2fbyte", memory_capacity * 1.0); @@ -124,7 +122,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } } -@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config break; } @@ -133,7 +131,7 @@ index 63504d2..06cc0b8 100644 printf("\tTRAN_SPEED: 0x%02x (", tran_speed); switch (tran_speed_timevalue) { case 0x0: -@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config printf("\tC_SIZE_MULT: 0x%01x\n", c_size_mult); printf("\tERASE_GRP_SIZE: 0x%02x\n", erase_grp_size); @@ -146,7 +144,7 @@ index 63504d2..06cc0b8 100644 wp_grp_size, wp_grp_size + 1); printf("\tWP_GRP_ENABLE: 0x%01x\n", wp_grp_enable); -@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config break; } @@ -155,7 +153,7 @@ index 63504d2..06cc0b8 100644 r2w_factor, r2w_factor); printf("\tWRITE_BL_LEN: 0x%01x (", write_bl_len); -@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config else printf("%.2fbyte", memory_capacity * 1.0); @@ -164,7 +162,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } else { int mult; -@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config printf("%.2fKbyte", memory_capacity / (1024.0)); else printf("%.2fbyte", memory_capacity * 1.0); @@ -173,11 +171,9 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } } -diff --git a/mmc_cmds.c b/mmc_cmds.c -index fb37189..8f4a476 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c -@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs, char **argv) +@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs, print_writeprotect_boot_status(ext_csd); @@ -185,7 +181,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs, char **argv) +@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs, exit(1); } @@ -193,7 +189,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs, char **argv) +@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs, if (last_wpblk != (x + y - 1)) print_wp_status(wp_sizeblks, last_wpblk, cnt - 1, last_prot); @@ -201,7 +197,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs, char **argv) +@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs, printf("MMC does not support disabling 512B emulation mode.\n"); } @@ -209,7 +205,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **argv) +@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **a value, EXT_CSD_PART_CONFIG, device); exit(1); } @@ -217,7 +213,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, char **argv) +@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, cha exit(1); } @@ -225,7 +221,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char **argv) +@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char ** exit(1); } @@ -233,7 +229,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv) +@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv printf("SEND_STATUS response: 0x%08x\n", response); @@ -241,7 +237,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **argv) +@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **arg printf("Write reliability setting register" " [WR_REL_SET]: 0x%02x\n", reg); @@ -263,7 +259,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs, char **argv) +@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs, exit(1); } @@ -271,6 +267,3 @@ index fb37189..8f4a476 100644 return ret; } --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch index ca0e02af8d..186e61313b 100644 --- a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch +++ b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch @@ -14,8 +14,6 @@ Reviewed-by: Avri Altman mmc_cmds.c | 70 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 31 deletions(-) -diff --git a/mmc.h b/mmc.h -index 648fb26..d648f68 100644 --- a/mmc.h +++ b/mmc.h @@ -25,10 +25,12 @@ @@ -31,8 +29,6 @@ index 648fb26..d648f68 100644 #define MMC_WRITE_BLOCK 24 /* adtc [31:0] data addr R1 */ #define MMC_WRITE_MULTIPLE_BLOCK 25 /* adtc R1 */ #define MMC_SET_WRITE_PROT 28 /* ac [31:0] data addr R1b */ -diff --git a/mmc_cmds.c b/mmc_cmds.c -index 8f4a476..c006ef2 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -2456,12 +2456,13 @@ int do_ffu(int nargs, char **argv) @@ -183,6 +179,3 @@ index 8f4a476..c006ef2 100644 goto out; } --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch index 64d275cdac..185d64e474 100644 --- a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch +++ b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch @@ -13,8 +13,6 @@ Reviewed-by: Wolfram Sang lsmmc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index 06cc0b8..05d59e8 100644 --- a/lsmmc.c +++ b/lsmmc.c @@ -393,10 +393,9 @@ char *read_file(char *name) @@ -30,6 +28,3 @@ index 06cc0b8..05d59e8 100644 } /* Hexadecimal string parsing functions */ --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch index 5910564137..ec0c4d9039 100644 --- a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch +++ b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch @@ -14,11 +14,9 @@ Reviewed-by: Avri Altman mmc_cmds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/mmc_cmds.c b/mmc_cmds.c -index c006ef2..556c105 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c -@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **argv) +@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **arg printf("Power off notification [POWER_OFF_LONG_TIME: 0x%02x]\n", ext_csd[247]); printf("Cache Size [CACHE_SIZE] is %d KiB\n", @@ -29,6 +27,3 @@ index c006ef2..556c105 100644 } /* A441: Reserved [501:247] --- -2.17.1 - diff --git a/utils/moreutils/patches/002_no-install-strip.patch b/utils/moreutils/patches/002_no-install-strip.patch index d7008d6b75..ecc1403af0 100644 --- a/utils/moreutils/patches/002_no-install-strip.patch +++ b/utils/moreutils/patches/002_no-install-strip.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -2,7 +2,7 @@ BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno +@@ -2,7 +2,7 @@ BINS=isutf8 ifdata ifne pee sponge mispi PERLSCRIPTS=vidir vipe ts combine zrun chronic MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1 CFLAGS?=-O2 -g -Wall diff --git a/utils/mpack/patches/001-use-stdlib.patch b/utils/mpack/patches/001-use-stdlib.patch index c5d10df7df..96b928a80a 100644 --- a/utils/mpack/patches/001-use-stdlib.patch +++ b/utils/mpack/patches/001-use-stdlib.patch @@ -1,7 +1,5 @@ -Index: mpack-1.6/unixos.c -=================================================================== ---- mpack-1.6.orig/unixos.c -+++ mpack-1.6/unixos.c +--- a/unixos.c ++++ b/unixos.c @@ -25,6 +25,7 @@ #include #include @@ -19,10 +17,8 @@ Index: mpack-1.6/unixos.c int overwrite_files = 0; int didchat; -Index: mpack-1.6/xmalloc.c -=================================================================== ---- mpack-1.6.orig/xmalloc.c -+++ mpack-1.6/xmalloc.c +--- a/xmalloc.c ++++ b/xmalloc.c @@ -24,7 +24,7 @@ */ #include diff --git a/utils/mt-st/patches/010-sysmacros.patch b/utils/mt-st/patches/010-sysmacros.patch index 456b2a752e..94abc2ef88 100644 --- a/utils/mt-st/patches/010-sysmacros.patch +++ b/utils/mt-st/patches/010-sysmacros.patch @@ -1,5 +1,3 @@ -diff --git a/mt.c b/mt.c -index d4058c0..4837808 100644 --- a/mt.c +++ b/mt.c @@ -20,6 +20,7 @@ @@ -10,8 +8,6 @@ index d4058c0..4837808 100644 #include #include -diff --git a/stinit.c b/stinit.c -index 5a50341..af5582c 100644 --- a/stinit.c +++ b/stinit.c @@ -16,6 +16,7 @@ diff --git a/utils/netwhere/patches/010-libmicrohttpd.patch b/utils/netwhere/patches/010-libmicrohttpd.patch index 45e0448c8d..8592e248d3 100644 --- a/utils/netwhere/patches/010-libmicrohttpd.patch +++ b/utils/netwhere/patches/010-libmicrohttpd.patch @@ -16,7 +16,7 @@ struct MHD_Connection * connection, const char * url, const char * method, -@@ -53,7 +53,7 @@ int WebService::on_request(void * cls, +@@ -53,7 +53,7 @@ int WebService::on_request(void size_t * upload_data_size, void ** ptr) { static int dummy; diff --git a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch b/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch index e7ec5c27c3..7bb6c9c0e4 100644 --- a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch +++ b/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch @@ -15,8 +15,6 @@ Signed-off-by: Daniel Golle .../linux_cgroups_relative_hugetlb.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go -index d71dfb9e..e1db3f1b 100644 --- a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go +++ b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go @@ -24,7 +24,7 @@ func testHugetlbCgroups() error { @@ -28,8 +26,6 @@ index d71dfb9e..e1db3f1b 100644 for _, pageSize := range pageSizes { g, err := util.GetDefaultGenerator() -diff --git a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go -index b6d7ae81..583a9fa8 100644 --- a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go +++ b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go @@ -21,7 +21,7 @@ func main() { diff --git a/utils/openobex/patches/001-cxx.patch b/utils/openobex/patches/001-cxx.patch index ec53b4d1da..2b41b08bc7 100644 --- a/utils/openobex/patches/001-cxx.patch +++ b/utils/openobex/patches/001-cxx.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 813f900..a0942e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ diff --git a/utils/pcmciautils/patches/001-switch_unsigned.patch b/utils/pcmciautils/patches/001-switch_unsigned.patch index 8a1559cd94..32d97f4280 100644 --- a/utils/pcmciautils/patches/001-switch_unsigned.patch +++ b/utils/pcmciautils/patches/001-switch_unsigned.patch @@ -1,6 +1,6 @@ --- a/src/yacc_config.y +++ b/src/yacc_config.y -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ int yylex(void); %union { char *str; diff --git a/utils/pcmciautils/patches/002-disable_yywrap.patch b/utils/pcmciautils/patches/002-disable_yywrap.patch index e30abb0d10..41895d2a95 100644 --- a/utils/pcmciautils/patches/002-disable_yywrap.patch +++ b/utils/pcmciautils/patches/002-disable_yywrap.patch @@ -1,6 +1,6 @@ ---- pcmciautils-018/src/lex_config.l -+++ pcmciautils-018/src/lex_config.l -@@ -1,8 +1,8 @@ +--- a/src/lex_config.l ++++ b/src/lex_config.l +@@ -1,6 +1,6 @@ /* Special state for handling include files */ %x src -%option noinput nounput @@ -8,11 +8,7 @@ %{ /* - * Startup tool for non statically mapped PCMCIA sockets - * -@@ -75,14 +75,10 @@ module /* skip */ ; - - . return yytext[0]; +@@ -77,10 +77,6 @@ module /* skip */ ; %% @@ -23,5 +19,3 @@ /*====================================================================== Stuff to parse basic data types - - ======================================================================*/ diff --git a/utils/pcsc-tools/patches/001-disable-atr.patch b/utils/pcsc-tools/patches/001-disable-atr.patch index 4ae111cdb8..fcca4cd1ca 100644 --- a/utils/pcsc-tools/patches/001-disable-atr.patch +++ b/utils/pcsc-tools/patches/001-disable-atr.patch @@ -1,11 +1,9 @@ Disable the analyze ATR perl-script and as we don't want to pull in perl as a dependency. -diff --git a/pcsc_scan.c b/pcsc_scan.c -index d89bc3e..134b675 100644 --- a/pcsc_scan.c +++ b/pcsc_scan.c -@@ -241,7 +241,7 @@ static void initialize_options(options_t *options, const char *pname) +@@ -241,7 +241,7 @@ static void initialize_options(options_t #ifdef WIN32 options->analyse_atr = False; #else diff --git a/utils/picocom/patches/010-fix-compile.patch b/utils/picocom/patches/010-fix-compile.patch index ec4ecb56a6..b05231f3aa 100644 --- a/utils/picocom/patches/010-fix-compile.patch +++ b/utils/picocom/patches/010-fix-compile.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index d6a4d60..a07d801 100644 --- a/Makefile +++ b/Makefile -@@ -51,7 +51,6 @@ linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h +@@ -51,7 +51,6 @@ linenoise-1.0/linenoise.o : linenoise-1. OBJS += picocom.o term.o fdio.o split.o termios2.o custbaud_bsd.o picocom : $(OBJS) diff --git a/utils/picocom/patches/020-fix-compile-x86.patch b/utils/picocom/patches/020-fix-compile-x86.patch index 3cc3291d7e..92b04006d9 100644 --- a/utils/picocom/patches/020-fix-compile-x86.patch +++ b/utils/picocom/patches/020-fix-compile-x86.patch @@ -11,8 +11,6 @@ macros. If not defined, we disable custom baudrate support. custbaud.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -diff --git a/custbaud.h b/custbaud.h -index 48151a4..ae4ae8d 100644 --- a/custbaud.h +++ b/custbaud.h @@ -26,6 +26,8 @@ @@ -39,6 +37,3 @@ index 48151a4..ae4ae8d 100644 #ifndef USE_CUSTOM_BAUD #define USE_CUSTOM_BAUD #endif --- -2.19.1 - diff --git a/utils/picocom/patches/030-usleep.patch b/utils/picocom/patches/030-usleep.patch index 15388d5275..27b20d1fab 100644 --- a/utils/picocom/patches/030-usleep.patch +++ b/utils/picocom/patches/030-usleep.patch @@ -10,8 +10,6 @@ Signed-off-by: Rosen Penev term.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/term.c b/term.c -index b45ab3d..23afd4f 100644 --- a/term.c +++ b/term.c @@ -33,6 +33,7 @@ diff --git a/utils/pigz/patches/001.patch b/utils/pigz/patches/001.patch index b75daa1b74..bdd910c320 100644 --- a/utils/pigz/patches/001.patch +++ b/utils/pigz/patches/001.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2019-05-22 19:54:23.980451289 +0800 -+++ b/Makefile 2019-06-10 10:32:58.054675929 +0800 +--- a/Makefile ++++ b/Makefile @@ -1,7 +1,7 @@ -CC=gcc -CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas diff --git a/utils/powertop/patches/002-strerror_r.patch b/utils/powertop/patches/002-strerror_r.patch index cf8659e1e3..7612a850b7 100644 --- a/utils/powertop/patches/002-strerror_r.patch +++ b/utils/powertop/patches/002-strerror_r.patch @@ -1,6 +1,6 @@ ---- traceevent/event-parse.c.orig -+++ ./traceevent/event-parse.c -@@ -5121,12 +5121,17 @@ +--- a/traceevent/event-parse.c ++++ b/traceevent/event-parse.c +@@ -5121,12 +5121,17 @@ int pevent_strerror(struct pevent *peven const char *msg; if (errnum >= 0) { diff --git a/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch b/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch index e01f0d540f..7af8efe781 100644 --- a/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch +++ b/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch @@ -21,8 +21,6 @@ Signed-off-by: Rosen Penev src/main.cpp | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/main.cpp b/src/main.cpp -index cbb7a4e..75d4202 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,7 @@ @@ -33,6 +31,3 @@ index cbb7a4e..75d4202 100644 #include "cpu/cpu.h" #include "process/process.h" --- -2.17.1 - diff --git a/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch b/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch index 46d01703f8..6dd77ef8ed 100644 --- a/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch +++ b/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch @@ -12,11 +12,9 @@ Signed-off-by: Rosen Penev src/cpu/intel_cpus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index 0030dba..4dffadc 100644 --- a/src/cpu/intel_cpus.cpp +++ b/src/cpu/intel_cpus.cpp -@@ -92,7 +92,7 @@ int is_supported_intel_cpu(int model, int cpu) +@@ -92,7 +92,7 @@ int is_supported_intel_cpu(int model, in int is_intel_pstate_driver_loaded() { @@ -25,6 +23,3 @@ index 0030dba..4dffadc 100644 const string intel_pstate("intel_pstate"); char line[32] = { '\0' }; ifstream file; --- -2.17.1 - diff --git a/utils/procps-ng/patches/100-no-tests-docs.patch b/utils/procps-ng/patches/100-no-tests-docs.patch index 3ae60ace8c..b863fba3de 100644 --- a/utils/procps-ng/patches/100-no-tests-docs.patch +++ b/utils/procps-ng/patches/100-no-tests-docs.patch @@ -14,7 +14,7 @@ LDADD = ./proc/libprocps.la $(CYGWINFLAGS) --- a/configure.ac +++ b/configure.ac -@@ -292,8 +292,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda +@@ -298,8 +298,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit AC_CONFIG_FILES([Makefile include/Makefile diff --git a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch index 4d11c4ab14..8f1c5fe576 100644 --- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch +++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch @@ -9,8 +9,6 @@ OpenWrt base build system decide flavor of fortify_source to use configure | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/configure b/configure -index 23b5e93752..c8d2ac1c3e 100755 --- a/configure +++ b/configure @@ -1601,6 +1601,8 @@ for opt do diff --git a/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch b/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch index 0af7763d49..162a06f25b 100644 --- a/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch +++ b/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch @@ -7,8 +7,6 @@ Subject: [PATCH] configure: allow enabling/disabling libudev from command line configure | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/configure b/configure -index c8d2ac1c3e..cf3f8ffdd7 100755 --- a/configure +++ b/configure @@ -1601,6 +1601,10 @@ for opt do diff --git a/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch b/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch index afeb2738b7..5a49ab596f 100644 --- a/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch +++ b/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch @@ -12,8 +12,6 @@ Fixes a512590 ("configure: qemu-ga is only needed with softmmu targets") configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure b/configure -index cf3f8ffdd7..b4af83a01f 100755 --- a/configure +++ b/configure @@ -6414,7 +6414,7 @@ fi diff --git a/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch b/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch index 52c4b3b39c..df79e24172 100644 --- a/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch +++ b/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch @@ -7,11 +7,9 @@ Subject: [PATCH] disas: fix compilation failure when isnan is a macro disas/libvixl/vixl/utils.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -diff --git a/disas/libvixl/vixl/utils.h b/disas/libvixl/vixl/utils.h -index 5ab134e240..df30663df8 100644 --- a/disas/libvixl/vixl/utils.h +++ b/disas/libvixl/vixl/utils.h -@@ -118,11 +118,17 @@ double double_pack(uint64_t sign, uint64_t exp, uint64_t mantissa); +@@ -118,11 +118,17 @@ double double_pack(uint64_t sign, uint64 // An fpclassify() function for 16-bit half-precision floats. int float16classify(float16 value); @@ -30,7 +28,7 @@ index 5ab134e240..df30663df8 100644 return true; } return false; -@@ -132,7 +138,7 @@ inline bool IsSignallingNaN(double num) { +@@ -132,7 +138,7 @@ inline bool IsSignallingNaN(double num) inline bool IsSignallingNaN(float num) { const uint32_t kFP32QuietNaNMask = 0x00400000; uint32_t raw = float_to_rawbits(num); @@ -39,7 +37,7 @@ index 5ab134e240..df30663df8 100644 return true; } return false; -@@ -148,21 +154,21 @@ inline bool IsSignallingNaN(float16 num) { +@@ -148,21 +154,21 @@ inline bool IsSignallingNaN(float16 num) template inline bool IsQuietNaN(T num) { diff --git a/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch b/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch index 7785bd2d9e..ae0fc6d97b 100644 --- a/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch +++ b/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch @@ -7,8 +7,6 @@ Subject: [PATCH] pc-bios: fix compilation when $(AS) is actually gcc driver pc-bios/optionrom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile -index e33a24da0d..ce734e8202 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -34,7 +34,7 @@ endif @@ -20,7 +18,7 @@ index e33a24da0d..ce734e8202 100644 QEMU_CFLAGS += $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32) build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin -@@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin +@@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin l %.o: %.S diff --git a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch b/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch index 2cc566e1b3..75ed9fd6f3 100644 --- a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch +++ b/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch @@ -20,8 +20,6 @@ Signed-off-by: Yousong Zhou util/mmap-alloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c -index 27dcccd8ec..e133e38d21 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -12,9 +12,6 @@ diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch index 1bcf720884..97991a8788 100644 --- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch +++ b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch @@ -11,11 +11,9 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf qga/commands-posix.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/qga/commands-posix.c b/qga/commands-posix.c -index a52af0315f..623d856c64 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c -@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int *status, Error **errp) +@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) { const char *shutdown_flag; @@ -23,7 +21,7 @@ index a52af0315f..623d856c64 100644 Error *local_err = NULL; pid_t pid; int status; -@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, c slog("guest-shutdown called, mode: %s", mode); if (!has_mode || strcmp(mode, "powerdown") == 0) { shutdown_flag = "-P"; @@ -37,7 +35,7 @@ index a52af0315f..623d856c64 100644 } else { error_setg(errp, "mode is invalid (valid values are: halt|powerdown|reboot"); -@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, c execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", "hypervisor initiated shutdown", (char*)NULL, environ); diff --git a/utils/quota/patches/020-remove-reallocarray.patch b/utils/quota/patches/020-remove-reallocarray.patch index 942e38eeb0..75c7a5d9bf 100644 --- a/utils/quota/patches/020-remove-reallocarray.patch +++ b/utils/quota/patches/020-remove-reallocarray.patch @@ -1,5 +1,3 @@ -diff --git a/quota.c b/quota.c -index a6ed61f..a60de12 100644 --- a/quota.c +++ b/quota.c @@ -385,7 +385,7 @@ int main(int argc, char **argv) diff --git a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch b/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch index 485cb30dfd..a389475c89 100644 --- a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch +++ b/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch @@ -12,11 +12,9 @@ Signed-off-by: Stijn Tintel viewadsb.c | 5 ++++- 3 files changed, 20 insertions(+), 5 deletions(-) -diff --git a/anet.c b/anet.c -index 5c35ff8..7f01958 100644 --- a/anet.c +++ b/anet.c -@@ -212,7 +212,10 @@ static int anetTcpGenericConnect(char *err, char *addr, char *service, int flags +@@ -212,7 +212,10 @@ static int anetTcpGenericConnect(char *e if (ss) { memcpy(ss, p->ai_addr, sizeof(*ss)); } @@ -28,7 +26,7 @@ index 5c35ff8..7f01958 100644 return s; } -@@ -220,7 +223,10 @@ static int anetTcpGenericConnect(char *err, char *addr, char *service, int flags +@@ -220,7 +223,10 @@ static int anetTcpGenericConnect(char *e anetCloseSocket(s); } @@ -40,7 +38,7 @@ index 5c35ff8..7f01958 100644 return ANET_ERR; } -@@ -368,7 +374,10 @@ int anetTcpServer(char *err, char *service, char *bindaddr, int *fds, int nfds) +@@ -368,7 +374,10 @@ int anetTcpServer(char *err, char *servi fds[i++] = s; } @@ -52,8 +50,6 @@ index 5c35ff8..7f01958 100644 return (i > 0 ? i : ANET_ERR); } -diff --git a/net_io.c b/net_io.c -index 1f4d848..5f59194 100644 --- a/net_io.c +++ b/net_io.c @@ -3285,7 +3285,10 @@ void cleanupNetwork(void) { @@ -68,8 +64,6 @@ index 1f4d848..5f59194 100644 if (con->mutex) { pthread_mutex_unlock(con->mutex); pthread_mutex_destroy(con->mutex); -diff --git a/viewadsb.c b/viewadsb.c -index 5fc5386..ad7b1bd 100644 --- a/viewadsb.c +++ b/viewadsb.c @@ -308,7 +308,10 @@ int main(int argc, char **argv) { @@ -84,6 +78,3 @@ index 5fc5386..ad7b1bd 100644 pthread_mutex_unlock(con->mutex); pthread_mutex_destroy(con->mutex); free(con->mutex); --- -2.26.2 - diff --git a/utils/readsb/patches/010-gcc10.patch b/utils/readsb/patches/010-gcc10.patch index 2ef972294e..ffa7a37542 100644 --- a/utils/readsb/patches/010-gcc10.patch +++ b/utils/readsb/patches/010-gcc10.patch @@ -9,8 +9,6 @@ Subject: [PATCH] Clean up linkage of struct Modes. viewadsb.c | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/readsb.c b/readsb.c -index e784d891..d6dab324 100644 --- a/readsb.c +++ b/readsb.c @@ -57,6 +57,8 @@ @@ -22,8 +20,6 @@ index e784d891..d6dab324 100644 // // ============================= Program options help ========================== // -diff --git a/readsb.h b/readsb.h -index 3a1b22d5..1b80c338 100644 --- a/readsb.h +++ b/readsb.h @@ -312,7 +312,7 @@ struct mag_buf @@ -46,8 +42,6 @@ index 3a1b22d5..1b80c338 100644 // The struct we use to store information about a decoded message. -diff --git a/viewadsb.c b/viewadsb.c -index ad7b1bd0..915305b6 100644 --- a/viewadsb.c +++ b/viewadsb.c @@ -54,6 +54,8 @@ diff --git a/utils/relayctl/patches/0001-ftdi1.patch b/utils/relayctl/patches/0001-ftdi1.patch index 0b08395f43..f13267ae65 100644 --- a/utils/relayctl/patches/0001-ftdi1.patch +++ b/utils/relayctl/patches/0001-ftdi1.patch @@ -8,19 +8,13 @@ Signed-off-by: Heinrich Schuchardt src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index a533d5c..4dbe6b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,7 +1,7 @@ - sbin_PROGRAMS = \ +@@ -1,6 +1,6 @@ + bin_PROGRAMS = \ relayctl -relayctl_LDFLAGS = -lftdi +relayctl_LDFLAGS = -lftdi1 relayctl_SOURCES = relayctl.c - --- -2.1.4 - diff --git a/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch b/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch index 442fe49721..073c3102af 100644 --- a/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch +++ b/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch @@ -1,7 +1,6 @@ -diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure ---- rrdtool-1.0.50/configure 2005-04-25 22:48:09.000000000 +0200 -+++ rrdtool-1.0.50.new/configure 2009-03-09 17:25:38.000000000 +0100 -@@ -24873,17 +24873,12 @@ +--- a/configure ++++ b/configure +@@ -24873,17 +24873,12 @@ echo "$as_me:$LINENO: result: and out ag echo "${ECHO_T}and out again" >&6 echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6 diff --git a/utils/rrdtool1/patches/002-no_timezone.patch b/utils/rrdtool1/patches/002-no_timezone.patch index 07564b4dd9..67bc9b15b4 100644 --- a/utils/rrdtool1/patches/002-no_timezone.patch +++ b/utils/rrdtool1/patches/002-no_timezone.patch @@ -1,6 +1,6 @@ --- a/src/rrd_tool.c +++ b/src/rrd_tool.c -@@ -225,11 +225,8 @@ +@@ -225,11 +225,8 @@ int main(int argc, char *argv[]) struct rusage myusage; struct timeval starttime; struct timeval currenttime; @@ -13,7 +13,7 @@ #endif while (fgets(aLine, sizeof(aLine)-1, stdin)){ -@@ -252,7 +249,7 @@ +@@ -252,7 +249,7 @@ int main(int argc, char *argv[]) #if HAVE_GETRUSAGE getrusage(RUSAGE_SELF,&myusage); diff --git a/utils/rrdtool1/patches/020-x86-float-cast.patch b/utils/rrdtool1/patches/020-x86-float-cast.patch index 5b8a66276b..1de223443e 100644 --- a/utils/rrdtool1/patches/020-x86-float-cast.patch +++ b/utils/rrdtool1/patches/020-x86-float-cast.patch @@ -1,7 +1,5 @@ -Index: rrdtool-1.0.50/src/rrd_format.h -=================================================================== ---- rrdtool-1.0.50.orig/src/rrd_format.h -+++ rrdtool-1.0.50/src/rrd_format.h +--- a/src/rrd_format.h ++++ b/src/rrd_format.h @@ -20,7 +20,7 @@ #define RRD_COOKIE "RRD" diff --git a/utils/rrdtool1/patches/030-pod2man-stderr.patch b/utils/rrdtool1/patches/030-pod2man-stderr.patch index feadf3aa5b..38deac7fa3 100644 --- a/utils/rrdtool1/patches/030-pod2man-stderr.patch +++ b/utils/rrdtool1/patches/030-pod2man-stderr.patch @@ -1,6 +1,6 @@ ---- rrdtool-1.0.50/doc/Makefile.am.orig 2013-11-16 11:44:50.940231208 -0500 -+++ rrdtool-1.0.50/doc/Makefile.am 2013-11-16 11:45:09.802229483 -0500 -@@ -35,7 +35,7 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -35,7 +35,7 @@ iman_DATA = $(MAN) all-local: link txt man html .pod.1 .pm.1 .pl.1: diff --git a/utils/sane-backends/patches/002-remove-uneeded.patch b/utils/sane-backends/patches/002-remove-uneeded.patch index 418fd8a159..e02eed0738 100644 --- a/utils/sane-backends/patches/002-remove-uneeded.patch +++ b/utils/sane-backends/patches/002-remove-uneeded.patch @@ -1,7 +1,5 @@ -Index: sane-backends-1.0.31/Makefile.in -=================================================================== ---- sane-backends-1.0.31.orig/Makefile.in -+++ sane-backends-1.0.31/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -442,7 +442,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch b/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch index 8b797a1966..5478a3865e 100644 --- a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch +++ b/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch @@ -1,9 +1,7 @@ https://gitlab.com/sane-project/backends/issues/237 -Index: sane-backends-1.0.31/backend/genesys/image_pipeline.cpp -=================================================================== ---- sane-backends-1.0.31.orig/backend/genesys/image_pipeline.cpp -+++ sane-backends-1.0.31/backend/genesys/image_pipeline.cpp +--- a/backend/genesys/image_pipeline.cpp ++++ b/backend/genesys/image_pipeline.cpp @@ -754,7 +754,11 @@ bool ImagePipelineNodeCalibrate::get_nex float value_f = static_cast(value) / max_value; diff --git a/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch b/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch index dd53747a8c..a2518b7d11 100644 --- a/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch +++ b/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch @@ -11,8 +11,6 @@ Fixes #345. backend/pixma/pixma_mp800.c | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) -diff --git a/backend/pixma/pixma_common.c b/backend/pixma/pixma_common.c -index ff3bd487d..2f46082e2 100644 --- a/backend/pixma/pixma_common.c +++ b/backend/pixma/pixma_common.c @@ -56,8 +56,6 @@ @@ -24,7 +22,7 @@ index ff3bd487d..2f46082e2 100644 #endif #include "pixma_rename.h" -@@ -1241,6 +1239,7 @@ pixma_get_device_status (pixma_t * s, pixma_device_status_t * status) +@@ -1241,6 +1239,7 @@ pixma_get_device_status (pixma_t * s, pi return s->ops->get_status (s, status); } @@ -37,11 +35,9 @@ index ff3bd487d..2f46082e2 100644 return status; } +#endif -diff --git a/backend/pixma/pixma_common.h b/backend/pixma/pixma_common.h -index bee839c2c..1ced88d17 100644 --- a/backend/pixma/pixma_common.h +++ b/backend/pixma/pixma_common.h -@@ -205,7 +205,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *, unsigned cmd, +@@ -205,7 +205,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *, int pixma_exec (pixma_t *, pixma_cmdbuf_t *); int pixma_exec_short_cmd (pixma_t *, pixma_cmdbuf_t *, unsigned cmd); int pixma_map_status_errno (unsigned status); @@ -51,8 +47,6 @@ index bee839c2c..1ced88d17 100644 /**@}*/ #define pixma_fill_checksum(start, end) do { \ -diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c -index cd6cd3ddf..a18fbdce1 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -322,6 +322,10 @@ @@ -66,7 +60,7 @@ index cd6cd3ddf..a18fbdce1 100644 enum mp150_state_t { state_idle, -@@ -459,7 +463,11 @@ send_xml_dialog (pixma_t * s, const char * xml_message) +@@ -459,7 +463,11 @@ send_xml_dialog (pixma_t * s, const char PDBG (pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message)); PDBG (pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf)); @@ -78,8 +72,6 @@ index cd6cd3ddf..a18fbdce1 100644 } static int -diff --git a/backend/pixma/pixma_mp800.c b/backend/pixma/pixma_mp800.c -index 8b7b232fd..e05107d04 100644 --- a/backend/pixma/pixma_mp800.c +++ b/backend/pixma/pixma_mp800.c @@ -152,6 +152,10 @@ @@ -93,7 +85,7 @@ index 8b7b232fd..e05107d04 100644 enum mp810_state_t { state_idle, -@@ -291,7 +295,11 @@ static int send_xml_dialog (pixma_t * s, const char * xml_message) +@@ -291,7 +295,11 @@ static int send_xml_dialog (pixma_t * s, PDBG(pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message)); PDBG(pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf)); @@ -105,6 +97,3 @@ index 8b7b232fd..e05107d04 100644 } static void new_cmd_tpu_msg (pixma_t *s, pixma_cmdbuf_t * cb, uint16_t cmd) --- -GitLab - diff --git a/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch b/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch index 5b54260079..2589f2f991 100644 --- a/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch +++ b/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch @@ -8,11 +8,9 @@ Signed-off-by: Thomas Petazzoni sepolgen/src/sepolgen/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/sepolgen/src/sepolgen/defaults.py b/sepolgen/src/sepolgen/defaults.py -index 6e800695..a61d1efd 100644 --- a/sepolgen/src/sepolgen/defaults.py +++ b/sepolgen/src/sepolgen/defaults.py -@@ -57,7 +57,7 @@ Various default settings, including file and directory locations. +@@ -57,7 +57,7 @@ Various default settings, including file """ def data_dir(): @@ -21,6 +19,3 @@ index 6e800695..a61d1efd 100644 def perm_map(): return data_dir() + "/perm_map" --- -2.21.0 - diff --git a/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch b/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch index 0ebc3e593a..426781b8bb 100644 --- a/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch +++ b/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch @@ -11,8 +11,6 @@ Signed-off-by: Thomas Petazzoni sepolgen/src/sepolgen/audit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/sepolgen/src/sepolgen/audit.py b/sepolgen/src/sepolgen/audit.py -index 4adb851f..5eafa587 100644 --- a/sepolgen/src/sepolgen/audit.py +++ b/sepolgen/src/sepolgen/audit.py @@ -41,7 +41,7 @@ def get_audit_boot_msgs(): @@ -33,6 +31,3 @@ index 4adb851f..5eafa587 100644 stdout=subprocess.PIPE).communicate()[0] if util.PY3: output = util.decode_input(output) --- -2.21.0 - diff --git a/utils/setools/patches/010-no-format.patch b/utils/setools/patches/010-no-format.patch index d81a9c6e49..939959f659 100644 --- a/utils/setools/patches/010-no-format.patch +++ b/utils/setools/patches/010-no-format.patch @@ -1,7 +1,6 @@ -diff -u --recursive setools-vanilla/setup.py setools/setup.py ---- setools-vanilla/setup.py 2020-04-01 09:57:49.000000000 -0500 -+++ setools/setup.py 2020-08-12 21:44:41.265149504 -0500 -@@ -109,7 +109,6 @@ +--- a/setup.py ++++ b/setup.py +@@ -109,7 +109,6 @@ ext_py_mods = [Extension('setools.policy extra_compile_args=['-Werror', '-Wextra', '-Waggregate-return', '-Wfloat-equal', diff --git a/utils/setools/patches/020-no-deprecated.patch b/utils/setools/patches/020-no-deprecated.patch index 5059bed44b..cf3b0e2fe1 100644 --- a/utils/setools/patches/020-no-deprecated.patch +++ b/utils/setools/patches/020-no-deprecated.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -126,6 +126,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'], +@@ -125,6 +125,7 @@ ext_py_mods = [Extension('setools.policy '-Wno-unreachable-code', '-Wno-implicit-fallthrough', '-Wno-cast-function-type', diff --git a/utils/setserial/patches/010-no-docs.patch b/utils/setserial/patches/010-no-docs.patch index 1fc2473835..8069c07d3c 100644 --- a/utils/setserial/patches/010-no-docs.patch +++ b/utils/setserial/patches/010-no-docs.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.in b/Makefile.in -index 00b9eb1..2fdbae3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ DEFS = @DEFS@ diff --git a/utils/smartmontools/patches/001-use-external-drivedb.patch b/utils/smartmontools/patches/001-use-external-drivedb.patch index ba7bf16c55..1d3a7b66f2 100644 --- a/utils/smartmontools/patches/001-use-external-drivedb.patch +++ b/utils/smartmontools/patches/001-use-external-drivedb.patch @@ -1,8 +1,6 @@ -diff --git i/knowndrives.cpp w/knowndrives.cpp -index 072160a..d57417b 100644 ---- i/knowndrives.cpp -+++ w/knowndrives.cpp -@@ -40,11 +40,84 @@ const char * knowndrives_cpp_cvsid = "$Id: knowndrives.cpp 4842 2018-12-02 16:07 +--- a/knowndrives.cpp ++++ b/knowndrives.cpp +@@ -40,11 +40,84 @@ const char * knowndrives_cpp_cvsid = "$I // see read_default_drive_databases() below. // The drive_settings structure is described in drivedb.h. const drive_settings builtin_knowndrives[] = { diff --git a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch index a80e7c9b8b..b565f800d7 100644 --- a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch +++ b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 88928cf..736fabd 100755 --- a/configure +++ b/configure @@ -6964,7 +6964,7 @@ releaseversion='${PACKAGE}-${VERSION}' diff --git a/utils/smstools3/patches/004-modem-processes.patch b/utils/smstools3/patches/004-modem-processes.patch index 95de7ba014..8f0f446492 100644 --- a/utils/smstools3/patches/004-modem-processes.patch +++ b/utils/smstools3/patches/004-modem-processes.patch @@ -4,11 +4,9 @@ Date: Sun Feb 18 19:24:48 2018 +0100 Make modem processes terminate when main process dies -diff --git a/src/smsd.c b/src/smsd.c -index fdfa193..37b2e4d 100755 --- a/src/smsd.c +++ b/src/smsd.c -@@ -34,6 +34,7 @@ Either version 2 of the License, or (at your option) any later version. +@@ -34,6 +34,7 @@ Either version 2 of the License, or (at #ifndef DISABLE_INOTIFY #include #endif diff --git a/utils/squashfs-tools/patches/010-gcc10.patch b/utils/squashfs-tools/patches/010-gcc10.patch index 46c6a5ea0f..bbd4909ba8 100644 --- a/utils/squashfs-tools/patches/010-gcc10.patch +++ b/utils/squashfs-tools/patches/010-gcc10.patch @@ -28,8 +28,6 @@ Signed-off-by: Sergei Trofimovich squashfs-tools/mksquashfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 1beefef7..b6503063 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h @@ -143,7 +143,7 @@ struct append_file { diff --git a/utils/tang/patches/010-makefile.patch b/utils/tang/patches/010-makefile.patch index 30a480ef2a..94b073847e 100644 --- a/utils/tang/patches/010-makefile.patch +++ b/utils/tang/patches/010-makefile.patch @@ -19,7 +19,7 @@ dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen dist_bin_SCRIPTS = src/tang-show-keys libexec_PROGRAMS = src/tangd -@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http.h src/tangd.c +@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http. AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH) TESTS = tests/adv tests/rec diff --git a/utils/tang/patches/020-no-systemd.patch b/utils/tang/patches/020-no-systemd.patch index 571c72a20b..196941276b 100644 --- a/utils/tang/patches/020-no-systemd.patch +++ b/utils/tang/patches/020-no-systemd.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute], +@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser [AC_MSG_ERROR([http-parser required!])]) PKG_CHECK_MODULES([jose], [jose >= 8]) diff --git a/utils/telldus-core/patches/200-no-iconv.patch b/utils/telldus-core/patches/200-no-iconv.patch index c820307756..de9493b8b3 100644 --- a/utils/telldus-core/patches/200-no-iconv.patch +++ b/utils/telldus-core/patches/200-no-iconv.patch @@ -10,7 +10,7 @@ #endif #include #include -@@ -50,35 +51,8 @@ std::wstring TelldusCore::charToWstring(const char *value) { +@@ -50,35 +51,8 @@ std::wstring TelldusCore::charToWstring( return retval; #else @@ -48,7 +48,7 @@ #endif } -@@ -211,19 +185,8 @@ std::string TelldusCore::wideToString(const std::wstring &input) { +@@ -211,19 +185,8 @@ std::string TelldusCore::wideToString(co #else char *inPointer = inString; #endif diff --git a/utils/telldus-core/patches/930-usleep.patch b/utils/telldus-core/patches/930-usleep.patch index 7c30a105e9..c716129f85 100644 --- a/utils/telldus-core/patches/930-usleep.patch +++ b/utils/telldus-core/patches/930-usleep.patch @@ -29,7 +29,7 @@ #include #include -@@ -231,7 +230,7 @@ int TellStick::send( const std::string &strMessage ) { +@@ -231,7 +230,7 @@ int TellStick::send( const std::string & return TELLSTICK_SUCCESS; } } else if(ret == 0) { // No data available diff --git a/utils/tini/patches/001-override-git-version.patch b/utils/tini/patches/001-override-git-version.patch index e1870d0794..bd6484991f 100644 --- a/utils/tini/patches/001-override-git-version.patch +++ b/utils/tini/patches/001-override-git-version.patch @@ -6,14 +6,12 @@ Date: Sat Oct 31 16:53:39 2020 +1000 * This to help when building from source snapshots that don't have the .git file structure. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 332b361..3f6f44b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,27 +13,37 @@ if(MINIMAL) add_definitions(-DTINI_MINIMAL=1) endif() - + -# Extract git version and dirty-ness -execute_process ( - COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h @@ -21,24 +19,11 @@ index 332b361..3f6f44b 100644 - RESULT_VARIABLE git_version_check_ret - OUTPUT_VARIABLE tini_VERSION_GIT -) -- --execute_process( -- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no -- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" -- OUTPUT_VARIABLE git_dirty_check_out --) -- --if("${git_version_check_ret}" EQUAL 0) -- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") -- if(NOT "${git_dirty_check_out}" STREQUAL "") -- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") -- endif() +# Set the git version +if (NOT "${TINI_VERSION_GIT}" STREQUAL "") + # Set by the user directly + set(tini_VERSION_GIT "${TINI_VERSION_GIT}") - else() -- set(tini_VERSION_GIT "") ++else() + # Extract git version + execute_process ( + COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h @@ -46,7 +31,12 @@ index 332b361..3f6f44b 100644 + RESULT_VARIABLE git_version_check_ret + OUTPUT_VARIABLE tini_VERSION_GIT + ) -+ + +-execute_process( +- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" +- OUTPUT_VARIABLE git_dirty_check_out +-) + if("${git_version_check_ret}" EQUAL 0) + # Extract git dirty-ness + execute_process( @@ -54,7 +44,14 @@ index 332b361..3f6f44b 100644 + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + OUTPUT_VARIABLE git_dirty_check_out + ) -+ + +-if("${git_version_check_ret}" EQUAL 0) +- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") +- if(NOT "${git_dirty_check_out}" STREQUAL "") +- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") +- endif() +-else() +- set(tini_VERSION_GIT "") + if(NOT "${git_dirty_check_out}" STREQUAL "") + set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") + endif() @@ -66,5 +63,5 @@ index 332b361..3f6f44b 100644 +if(NOT ${tini_VERSION_GIT} STREQUAL "") + set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") endif() - + # Flags diff --git a/utils/unzip/patches/010-remove-build-date.patch b/utils/unzip/patches/010-remove-build-date.patch index bb60533cb0..9a33444d7a 100644 --- a/utils/unzip/patches/010-remove-build-date.patch +++ b/utils/unzip/patches/010-remove-build-date.patch @@ -6,7 +6,7 @@ Bug-Debian: https://bugs.debian.org/782851 --- a/unix/unix.c +++ b/unix/unix.c -@@ -1705,7 +1705,7 @@ +@@ -1705,7 +1705,7 @@ void version(__G) #endif /* Sun */ #endif /* SGI */ diff --git a/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch b/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch index e1fdcf588c..0c56ace8a9 100644 --- a/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch +++ b/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch @@ -4,20 +4,20 @@ /* - Copyright (c) 1990-2009 Info-ZIP. All rights reserved. + Copyright (c) 1990-2017 Info-ZIP. All rights reserved. - + See the accompanying file LICENSE, version 2009-Jan-02 or later (the contents of which are also included in unzip.h) for terms of use. -@@ -1582,6 +1582,8 @@ +@@ -1582,6 +1582,8 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, int r = IZ_PW_ENTERED; char *m; char *prompt; + char *ep; + char *zp; - + #ifndef REENTRANT /* tell picky compilers to shut up about "unused variable" warnings */ -@@ -1590,9 +1592,12 @@ - +@@ -1590,9 +1592,12 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, + if (*rcnt == 0) { /* First call for current entry */ *rcnt = 2; - if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) { diff --git a/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch index cb429860a1..8e07aca5db 100644 --- a/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch +++ b/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch @@ -22,8 +22,6 @@ preprocessor's __DATE__/__TIME__ symbols will be used. src/version.c | 8 ++++++++ 3 files changed, 21 insertions(+) -diff --git a/src/config.h.in b/src/config.h.in -index 5c8c7e5..436a0b7 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -30,6 +30,9 @@ @@ -36,11 +34,9 @@ index 5c8c7e5..436a0b7 100644 /* Define when __attribute__((unused)) can be used */ #undef HAVE_ATTRIBUTE_UNUSED -diff --git a/src/configure.ac b/src/configure.ac -index 8751b2e..cd43387 100644 --- a/src/configure.ac +++ b/src/configure.ac -@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; then +@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; th fi fi @@ -57,8 +53,6 @@ index 8751b2e..cd43387 100644 dnl Check for the flag that fails if stuff are missing. AC_MSG_CHECKING(--enable-fail-if-missing argument) -diff --git a/src/version.c b/src/version.c -index c8361eb..e51c738 100644 --- a/src/version.c +++ b/src/version.c @@ -44,9 +44,13 @@ init_longVersion(void) diff --git a/utils/vim/patches/002-remove_helptags_generation.patch b/utils/vim/patches/002-remove_helptags_generation.patch index 8ea06b55e0..992f81e677 100644 --- a/utils/vim/patches/002-remove_helptags_generation.patch +++ b/utils/vim/patches/002-remove_helptags_generation.patch @@ -1,6 +1,6 @@ --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile -@@ -323,10 +323,6 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) +@@ -323,10 +323,6 @@ all: tags vim.man evim.man vimdiff.man v # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) diff --git a/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch b/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch index 945d63e9a3..a710fb34a4 100644 --- a/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch +++ b/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index 5757ae3..20d52ce 100644 --- a/Makefile +++ b/Makefile -@@ -157,11 +157,7 @@ wipe.o : wipe.c random.h misc.h version.h +@@ -157,11 +157,7 @@ wipe.o : wipe.c random.h misc.h version. $(CC) $(CCO) $(CCOC) wipe.c -o wipe.o version.h: always @@ -15,8 +13,6 @@ index 5757ae3..20d52ce 100644 random.o : random.c misc.h md5.h $(CC) $(CCO) $(CCOC) random.c -o random.o -diff --git a/wipe.c b/wipe.c -index 5a215e8..5a4f2ad 100644 --- a/wipe.c +++ b/wipe.c @@ -24,7 +24,7 @@ diff --git a/utils/yara/patches/010-openssl.patch b/utils/yara/patches/010-openssl.patch index bbd22fd56c..a54b0001a9 100644 --- a/utils/yara/patches/010-openssl.patch +++ b/utils/yara/patches/010-openssl.patch @@ -9,11 +9,9 @@ #endif #endif -diff --git a/libyara/modules/pe/pe.c b/libyara/modules/pe/pe.c -index 8eace26..ed43abe 100644 --- a/libyara/modules/pe/pe.c +++ b/libyara/modules/pe/pe.c -@@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +@@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #endif #if OPENSSL_VERSION_NUMBER < 0x10100000L diff --git a/utils/ykpers/patches/020-json-c-0.14.patch b/utils/ykpers/patches/020-json-c-0.14.patch index ca5a918d21..2bb27c91d1 100644 --- a/utils/ykpers/patches/020-json-c-0.14.patch +++ b/utils/ykpers/patches/020-json-c-0.14.patch @@ -9,8 +9,6 @@ Upstream removed the TRUE and FALSE defines in commit ykpers-json.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -diff --git a/ykpers-json.c b/ykpers-json.c -index a62e907..15ad380 100644 --- a/ykpers-json.c +++ b/ykpers-json.c @@ -40,7 +40,7 @@ @@ -22,7 +20,7 @@ index a62e907..15ad380 100644 #endif static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { -@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st if(p->mode && (mode & p->mode) == mode) { json_object *joption; json_bool ret = yk_json_object_object_get(options, p->json_text, joption); @@ -31,7 +29,7 @@ index a62e907..15ad380 100644 int value = json_object_get_boolean(joption); if(value == 1) { p->setter(cfg, true); -@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg ykp_errno = YKP_EINVAL; goto out; } @@ -56,7 +54,7 @@ index a62e907..15ad380 100644 int target_config = json_object_get_int(jtarget); int command; if(target_config == 1) { -@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg if(mode == MODE_OATH_HOTP) { json_object *jdigits, *jrandom; ykp_set_tktflag_OATH_HOTP(cfg, true); @@ -72,7 +70,7 @@ index a62e907..15ad380 100644 int random = json_object_get_boolean(jrandom); int seed = 0; if(random == 1) { -@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg goto out; } else { json_object *jseed;