Skip to content
...@@ -14,7 +14,7 @@ PKG_RELEASE:=1 ...@@ -14,7 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/mfontanini/libtins PKG_SOURCE_URL:=https://github.com/mfontanini/libtins
PKG_MIRROR_HASH:=4029af89fd86246f166a89c11d5382bb0f5fe3bda95b00b4cf54d22596b37fcf PKG_MIRROR_HASH:=85c5a15beca56552ba3f33e10f2a82ee4c47be2b3334d163304362188a37b13a
PKG_MAINTAINER:= Steven Hessing <steven.hessing@gmail.com> PKG_MAINTAINER:= Steven Hessing <steven.hessing@gmail.com>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
......
...@@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git ...@@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/transmission/libutp PKG_SOURCE_URL:=https://github.com/transmission/libutp
PKG_SOURCE_DATE:=2023-02-14 PKG_SOURCE_DATE:=2023-02-14
PKG_SOURCE_VERSION:=c95738b1a6644b919e5b64d3ea9736cfc5894e0b PKG_SOURCE_VERSION:=c95738b1a6644b919e5b64d3ea9736cfc5894e0b
PKG_MIRROR_HASH:=5e466da0cb45119d58e8dd847da13951c94bfe9f20936f96b43f350d1e49c625 PKG_MIRROR_HASH:=abc2013d44bc30e4e12f89334f3f196243178699eeefbfc52744652889a150e6
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
......
...@@ -12,7 +12,7 @@ PKG_RELEASE:=2 ...@@ -12,7 +12,7 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/br101/libuwifi.git PKG_SOURCE_URL:=https://github.com/br101/libuwifi.git
PKG_SOURCE_VERSION:=0bfb8949c7a766555042f64be3d5ea9f8ed52690 PKG_SOURCE_VERSION:=0bfb8949c7a766555042f64be3d5ea9f8ed52690
PKG_MIRROR_HASH:=79be6f8b603bc76bae983ebd007a203c6ebfa069efbb233aaf09ccdff502310d PKG_MIRROR_HASH:=dafa4c1c83e9b385599435794f5bd34f11b529945cfa5a2b17dbdcd808ae41ec
PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>, Nick Hainke <vincent@systemli.org> PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>, Nick Hainke <vincent@systemli.org>
PKG_LICENSE:=LGPL-3.0-only PKG_LICENSE:=LGPL-3.0-only
......
...@@ -13,7 +13,7 @@ PKG_RELEASE:=2 ...@@ -13,7 +13,7 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.xiph.org/xiph/tremor.git PKG_SOURCE_URL:=https://gitlab.xiph.org/xiph/tremor.git
PKG_SOURCE_VERSION:=7c30a66346199f3f09017a09567c6c8a3a0eedc8 PKG_SOURCE_VERSION:=7c30a66346199f3f09017a09567c6c8a3a0eedc8
PKG_MIRROR_HASH:=9cdec0bf6663d7c9e615dd556a2f115efccded884fe52c8dd18b42120781bed0 PKG_MIRROR_HASH:=82aa52d3f1920e06834800d2c191530ce0ddc8a1f61986be4faea56d70cbb517
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
......
...@@ -14,7 +14,7 @@ PKG_RELEASE:=1 ...@@ -14,7 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx PKG_SOURCE_URL:=https://chromium.googlesource.com/webm/libvpx
PKG_MIRROR_HASH:=d270343d5ecbc5a0d4185329ff3b4e51e523505a3f1ffc5024e4365a58e53d35 PKG_MIRROR_HASH:=00c35f3101a55ac8f899174bacc27bb45fabfc2dd47ccfaa69eaab65d88e89cd
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com> PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
......
...@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk ...@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF) CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF)
CMAKE_OPTIONS += -DISABLE_WERROR=ON CMAKE_OPTIONS += -DDISABLE_WERROR=ON
CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
CMAKE_OPTIONS += -DLWS_WITH_EXTERNAL_POLL=ON CMAKE_OPTIONS += -DLWS_WITH_EXTERNAL_POLL=ON
CMAKE_OPTIONS += -DLWS_WITH_ULOOP=ON CMAKE_OPTIONS += -DLWS_WITH_ULOOP=ON
......
...@@ -14,7 +14,7 @@ PKG_RELEASE:=1 ...@@ -14,7 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://code.videolan.org/videolan/x264.git PKG_SOURCE_URL:=https://code.videolan.org/videolan/x264.git
PKG_SOURCE_VERSION:=4815ccadb1890572f2bf8b9d9553d56f6c9122ad PKG_SOURCE_VERSION:=4815ccadb1890572f2bf8b9d9553d56f6c9122ad
PKG_MIRROR_HASH:=6a8179183bdd88f2d7032342c23670e66571724ad774f96a6abac19f8eb7aad4 PKG_MIRROR_HASH:=50ab1157a4a026e44f551ea9d62c82626c88711f033a171e5031f2bf87b06eab
PKG_MAINTAINER:=Adrian Panella <ianchi74@outlook.com> PKG_MAINTAINER:=Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
......
...@@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git ...@@ -8,7 +8,7 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.openldap.org/openldap/openldap.git PKG_SOURCE_URL:=https://git.openldap.org/openldap/openldap.git
PKG_SOURCE_DATE:=2024-01-29 PKG_SOURCE_DATE:=2024-01-29
PKG_SOURCE_VERSION:=LMDB_$(PKG_VERSION) PKG_SOURCE_VERSION:=LMDB_$(PKG_VERSION)
PKG_MIRROR_HASH:=27ac1f056222f85b99568db0fd9048b23dee220c83efd1119f607492f4a53352 PKG_MIRROR_HASH:=2fe139bf74e186c937eae2b1dea9094d902c16a4852378135441f4c5d837fec5
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com> PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=OLDAP-2.8 PKG_LICENSE:=OLDAP-2.8
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=OpenBLAS PKG_NAME:=OpenBLAS
PKG_VERSION:=0.3.26 PKG_VERSION:=0.3.27
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/
PKG_HASH:=4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 PKG_HASH:=aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_CPE_ID:=cpe:/a:openblas_project:openblas PKG_CPE_ID:=cpe:/a:openblas_project:openblas
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
...@@ -100,6 +100,7 @@ MAKE_FLAGS += \ ...@@ -100,6 +100,7 @@ MAKE_FLAGS += \
NUM_THREADS=2 \ NUM_THREADS=2 \
PREFIX=/usr \ PREFIX=/usr \
COMMON_OPT="" \ COMMON_OPT="" \
ONLY_CBLAS=1 \
TARGET=$(call qstrip,$(OPENBLAS_TARGET)) TARGET=$(call qstrip,$(OPENBLAS_TARGET))
ifneq ($(CONFIG_INSTALL_GFORTRAN),y) ifneq ($(CONFIG_INSTALL_GFORTRAN),y)
......
...@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ...@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=protobuf PKG_NAME:=protobuf
PKG_VERSION:=3.17.3 PKG_VERSION:=3.17.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
...@@ -67,10 +67,8 @@ endef ...@@ -67,10 +67,8 @@ endef
CMAKE_HOST_OPTIONS += \ CMAKE_HOST_OPTIONS += \
-Dprotobuf_BUILD_PROTOC_BINARIES=ON \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
-Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_BUILD_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-Dprotobuf_BUILD_PROTOC_BINARIES=ON \ -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
...@@ -78,7 +76,7 @@ CMAKE_OPTIONS += \ ...@@ -78,7 +76,7 @@ CMAKE_OPTIONS += \
-Dprotobuf_WITH_ZLIB=ON \ -Dprotobuf_WITH_ZLIB=ON \
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
TARGET_LDFLAGS += -latomic $(if $(CONFIG_USE_GLIBC),-lm) TARGET_LDFLAGS += -latomic
define Build/InstallDev define Build/InstallDev
$(call Build/InstallDev/cmake,$(1)) $(call Build/InstallDev/cmake,$(1))
......
...@@ -12,7 +12,7 @@ PKG_RELEASE:=1 ...@@ -12,7 +12,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/taglib/taglib PKG_SOURCE_URL:=https://github.com/taglib/taglib
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MIRROR_HASH:=dd87b5d02264af72303f109fbaea11c8e1e6a98fe0617717008909b6fdc094a7 PKG_MIRROR_HASH:=de161820f5a5d3e0e0fb8f04fdae8c8a094897d1418e33b39ca634d4c538ecd0
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE:=LGPL-2.1-or-later
......
...@@ -8,7 +8,7 @@ PKG_RELEASE:=2 ...@@ -8,7 +8,7 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer
PKG_MIRROR_HASH:=ca9e4f48a1a71e8d8e595ce8981a876d11a7d3d0f67b9e68c7825730f2f8756a PKG_MIRROR_HASH:=0907dfbcb18cc0b2ff3e2af79eb7943c5215ec176db994a89832aef606c98a1a
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
......
...@@ -14,7 +14,7 @@ PKG_RELEASE:=3 ...@@ -14,7 +14,7 @@ PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/lloyd/yajl PKG_SOURCE_URL:=https://github.com/lloyd/yajl
PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_VERSION)
PKG_MIRROR_HASH:=0cd74320be0270a07931e42d2f14f87a8b3fb664ecb5db58b0e838886211ab1f PKG_MIRROR_HASH:=cd8a319a51947100a22173b20f26e5db0db764eb122c81cde87afa30ddbd1fb8
PKG_MAINTAINER:=Charles Southerland <charlie@stuphlabs.com> PKG_MAINTAINER:=Charles Southerland <charlie@stuphlabs.com>
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
......
...@@ -6,7 +6,7 @@ PKG_RELEASE:=1 ...@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/HardySimpson/zlog PKG_SOURCE_URL:=https://github.com/HardySimpson/zlog
PKG_SOURCE_VERSION:=1.2.17 PKG_SOURCE_VERSION:=1.2.17
PKG_MIRROR_HASH:=fcad107b91aa251c61b7409dfbae0421662154c4dc158c7a34ee2f69cde8f9a2 PKG_MIRROR_HASH:=d3f8530751763b83668891fc41744878d9f9af82344e2bada62d2bff9c5ff935
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com> PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
......
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=exim PKG_NAME:=exim
PKG_VERSION:=4.96.2 PKG_VERSION:=4.97.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/ PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/
PKG_HASH:=038e327e8d1e93d005bac9bb06fd22aec44d5028930d6dbe8817ad44bbfc1de6 PKG_HASH:=bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
...@@ -138,7 +138,7 @@ define Package/exim/conffiles ...@@ -138,7 +138,7 @@ define Package/exim/conffiles
endef endef
HOST_CFLAGS += -std=c99 HOST_CFLAGS += -std=c99
TARGET_CFLAGS += $(FPIC) -DNO_IP_OPTIONS -D_FILE_OFFSET_BITS=64 TARGET_CFLAGS += $(FPIC) -DNO_IP_OPTIONS -D_FILE_OFFSET_BITS=64 -DNO_EXECINFO
MAKE_VARS += build=Linux-$$(ARCH) MAKE_VARS += build=Linux-$$(ARCH)
MAKE_FLAGS += AR="$$(TARGET_AR) r" MAKE_FLAGS += AR="$$(TARGET_AR) r"
...@@ -152,7 +152,7 @@ define Build/Configure ...@@ -152,7 +152,7 @@ define Build/Configure
$(SED) 's%# EXIM_GROUP=.*%EXIM_GROUP=42%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# EXIM_GROUP=.*%EXIM_GROUP=42%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# EXIM_USER=.*%EXIM_USER=42%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# EXIM_USER=.*%EXIM_USER=42%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# INCLUDE=.*%INCLUDE=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# INCLUDE=.*%INCLUDE=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# HAVE_IPV6=YES%HAVE_IPV6=YES%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# HAVE_IPV6=yes%HAVE_IPV6=yes%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# WITH_CONTENT_SCAN=yes%WITH_CONTENT_SCAN=yes%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# WITH_CONTENT_SCAN=yes%WITH_CONTENT_SCAN=yes%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# SUPPORT_MAILDIR=yes%SUPPORT_MAILDIR=yes%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# SUPPORT_MAILDIR=yes%SUPPORT_MAILDIR=yes%' $(PKG_BUILD_DIR)/Local/Makefile
$(SED) 's%# SUPPORT_MAILSTORE=yes%SUPPORT_MAILSTORE=yes%' $(PKG_BUILD_DIR)/Local/Makefile $(SED) 's%# SUPPORT_MAILSTORE=yes%SUPPORT_MAILSTORE=yes%' $(PKG_BUILD_DIR)/Local/Makefile
......
--- a/src/drtables.c --- a/src/drtables.c
+++ b/src/drtables.c +++ b/src/drtables.c
@@ -662,7 +662,7 @@ addlookupmodule(NULL, &ibase_lookup_modu @@ -663,7 +663,7 @@ addlookupmodule(NULL, &ibase_lookup_modu
addlookupmodule(NULL, &ldap_lookup_module_info); addlookupmodule(NULL, &ldap_lookup_module_info);
#endif #endif
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
--- a/src/pdkim/signing.c --- a/src/pdkim/signing.c
+++ b/src/pdkim/signing.c +++ b/src/pdkim/signing.c
@@ -703,7 +703,6 @@ return NULL; @@ -704,7 +704,6 @@ return NULL;
void void
exim_dkim_init(void) exim_dkim_init(void)
{ {
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
--- a/src/tls-openssl.c --- a/src/tls-openssl.c
+++ b/src/tls-openssl.c +++ b/src/tls-openssl.c
@@ -22,7 +22,10 @@ functions from the OpenSSL library. */ @@ -23,7 +23,10 @@ functions from the OpenSSL library. */
#include <openssl/lhash.h> #include <openssl/lhash.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
# include <openssl/ec.h> # include <openssl/ec.h>
#endif #endif
@@ -885,8 +888,9 @@ pkey = EVP_RSA_gen(2048); @@ -944,8 +947,9 @@ pkey = EVP_RSA_gen(2048);
X509_set_version(x509, 2); /* N+1 - version 3 */ X509_set_version(x509, 2); /* N+1 - version 3 */
ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
X509_set_pubkey(x509, pkey); X509_set_pubkey(x509, pkey);
name = X509_get_subject_name(x509); name = X509_get_subject_name(x509);
@@ -4670,8 +4674,8 @@ return string_fmt_append(g, @@ -4979,8 +4983,8 @@ return string_fmt_append(g,
" Runtime: %s\n" " Runtime: %s\n"
" : %s\n", " : %s\n",
OPENSSL_VERSION_TEXT, OPENSSL_VERSION_TEXT,
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
/* third line is 38 characters for the %s and the line is 73 chars long; /* third line is 38 characters for the %s and the line is 73 chars long;
the OpenSSL output includes a "built on: " prefix already. */ the OpenSSL output includes a "built on: " prefix already. */
} }
@@ -4713,8 +4717,6 @@ if (pidnow != pidlast) @@ -5022,8 +5026,6 @@ if (pidnow != pidlast)
is unique for each thread", this doesn't apparently apply across processes, is unique for each thread", this doesn't apparently apply across processes,
so our own warning from vaguely_random_number_fallback() applies here too. so our own warning from vaguely_random_number_fallback() applies here too.
Fix per PostgreSQL. */ Fix per PostgreSQL. */
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
--- a/src/tlscert-openssl.c --- a/src/tlscert-openssl.c
+++ b/src/tlscert-openssl.c +++ b/src/tlscert-openssl.c
@@ -218,13 +218,13 @@ return mod ? tls_field_from_dn(cp, mod) @@ -219,13 +219,13 @@ return mod ? tls_field_from_dn(cp, mod)
uschar * uschar *
tls_cert_not_before(void * cert, uschar * mod) tls_cert_not_before(void * cert, uschar * mod)
{ {
......
...@@ -10,7 +10,7 @@ Last-Update: 2021-07-28 ...@@ -10,7 +10,7 @@ Last-Update: 2021-07-28
--- a/src/EDITME --- a/src/EDITME
+++ b/src/EDITME +++ b/src/EDITME
@@ -873,6 +873,21 @@ HEADERS_CHARSET="ISO-8859-1" @@ -904,6 +904,21 @@ HEADERS_CHARSET="ISO-8859-1"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
...@@ -45,7 +45,7 @@ Last-Update: 2021-07-28 ...@@ -45,7 +45,7 @@ Last-Update: 2021-07-28
#define CONFIGURE_FILE #define CONFIGURE_FILE
--- a/src/globals.c --- a/src/globals.c
+++ b/src/globals.c +++ b/src/globals.c
@@ -117,6 +117,10 @@ int dsn_ret = 0; @@ -118,6 +118,10 @@ int dsn_ret = 0;
const pcre2_code *regex_DSN = NULL; const pcre2_code *regex_DSN = NULL;
uschar *dsn_advertise_hosts = NULL; uschar *dsn_advertise_hosts = NULL;
...@@ -58,7 +58,7 @@ Last-Update: 2021-07-28 ...@@ -58,7 +58,7 @@ Last-Update: 2021-07-28
BOOL gnutls_allow_auto_pkcs11 = FALSE; BOOL gnutls_allow_auto_pkcs11 = FALSE;
--- a/src/globals.h --- a/src/globals.h
+++ b/src/globals.h +++ b/src/globals.h
@@ -155,6 +155,9 @@ extern int dsn_ret; / @@ -157,6 +157,9 @@ extern int dsn_ret; /
extern const pcre2_code *regex_DSN; /* For recognizing DSN settings */ extern const pcre2_code *regex_DSN; /* For recognizing DSN settings */
extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */ extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */
...@@ -70,8 +70,8 @@ Last-Update: 2021-07-28 ...@@ -70,8 +70,8 @@ Last-Update: 2021-07-28
--- a/src/local_scan.c --- a/src/local_scan.c
+++ b/src/local_scan.c +++ b/src/local_scan.c
@@ -7,58 +7,133 @@ @@ -8,58 +8,133 @@
/* See the file NOTICE for conditions of use and distribution. */ /* SPDX-License-Identifier: GPL-2.0-or-later */
-/****************************************************************************** -/******************************************************************************
...@@ -248,7 +248,7 @@ Last-Update: 2021-07-28 ...@@ -248,7 +248,7 @@ Last-Update: 2021-07-28
/* End of local_scan.c */ /* End of local_scan.c */
--- a/src/local_scan.h --- a/src/local_scan.h
+++ b/src/local_scan.h +++ b/src/local_scan.h
@@ -27,6 +27,7 @@ settings, and the store functions. */ @@ -28,6 +28,7 @@ settings, and the store functions. */
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -256,7 +256,7 @@ Last-Update: 2021-07-28 ...@@ -256,7 +256,7 @@ Last-Update: 2021-07-28
#include "config.h" #include "config.h"
#include "mytypes.h" #include "mytypes.h"
#include "store.h" #include "store.h"
@@ -166,6 +167,9 @@ extern header_line *header_list; / @@ -177,6 +178,9 @@ extern header_line *header_list; /
extern BOOL host_checking; /* Set when checking a host */ extern BOOL host_checking; /* Set when checking a host */
extern uschar *interface_address; /* Interface for incoming call */ extern uschar *interface_address; /* Interface for incoming call */
extern int interface_port; /* Port number for incoming call */ extern int interface_port; /* Port number for incoming call */
...@@ -266,7 +266,7 @@ Last-Update: 2021-07-28 ...@@ -266,7 +266,7 @@ Last-Update: 2021-07-28
extern uschar *message_id; /* Internal id of message being handled */ extern uschar *message_id; /* Internal id of message being handled */
extern uschar *received_protocol; /* Name of incoming protocol */ extern uschar *received_protocol; /* Name of incoming protocol */
extern int recipients_count; /* Number of recipients */ extern int recipients_count; /* Number of recipients */
@@ -236,4 +240,6 @@ extern pid_t child_open_exim2_functio @@ -247,4 +251,6 @@ extern pid_t child_open_exim2_functio
extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *); extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
#endif #endif
...@@ -275,7 +275,7 @@ Last-Update: 2021-07-28 ...@@ -275,7 +275,7 @@ Last-Update: 2021-07-28
/* End of local_scan.h */ /* End of local_scan.h */
--- a/src/readconf.c --- a/src/readconf.c
+++ b/src/readconf.c +++ b/src/readconf.c
@@ -212,6 +212,9 @@ static optionlist optionlist_config[] = @@ -216,6 +216,9 @@ static optionlist optionlist_config[] =
{ "local_from_prefix", opt_stringptr, {&local_from_prefix} }, { "local_from_prefix", opt_stringptr, {&local_from_prefix} },
{ "local_from_suffix", opt_stringptr, {&local_from_suffix} }, { "local_from_suffix", opt_stringptr, {&local_from_suffix} },
{ "local_interfaces", opt_stringptr, {&local_interfaces} }, { "local_interfaces", opt_stringptr, {&local_interfaces} },
...@@ -287,7 +287,7 @@ Last-Update: 2021-07-28 ...@@ -287,7 +287,7 @@ Last-Update: 2021-07-28
#endif #endif
--- a/src/string.c --- a/src/string.c
+++ b/src/string.c +++ b/src/string.c
@@ -428,6 +428,7 @@ return ss; @@ -453,6 +453,7 @@ return ss;
#if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \ #if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \
&& !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
...@@ -295,7 +295,7 @@ Last-Update: 2021-07-28 ...@@ -295,7 +295,7 @@ Last-Update: 2021-07-28
/************************************************* /*************************************************
* Copy and save string * * Copy and save string *
*************************************************/ *************************************************/
@@ -473,6 +474,7 @@ string_copyn_function(const uschar * s, @@ -498,6 +499,7 @@ string_copyn_function(const uschar * s,
{ {
return string_copyn(s, n); return string_copyn(s, n);
} }
......
--- a/src/drtables.c
+++ b/src/drtables.c
@@ -736,7 +736,7 @@ else
{
char * name = ent->d_name;
int len = (int)strlen(name);
- if (regex_match(regex_islookupmod, US name, len, NUL))
+ if (regex_match(regex_islookupmod, US name, len, NULL))
{
int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2;
void *dl;
--- a/src/exim.c --- a/src/exim.c
+++ b/src/exim.c +++ b/src/exim.c
@@ -636,13 +636,15 @@ exim_nullstd(void) @@ -642,13 +642,15 @@ exim_nullstd(void)
{ {
int devnull = -1; int devnull = -1;
struct stat statbuf; struct stat statbuf;
...@@ -31,7 +20,7 @@ ...@@ -31,7 +20,7 @@
} }
--- a/src/local_scan.h --- a/src/local_scan.h
+++ b/src/local_scan.h +++ b/src/local_scan.h
@@ -26,6 +26,7 @@ store.c @@ -27,6 +27,7 @@ store.c
settings, and the store functions. */ settings, and the store functions. */
#include <stdarg.h> #include <stdarg.h>
......
--- a/OS/Makefile-Base
+++ b/OS/Makefile-Base
@@ -253,7 +253,7 @@ utils: $(EXIM_MONITOR) exicyclog exinext
transport-filter.pl convert4r3 convert4r4 \
exim_checkaccess \
exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
- exim_lock exim_msgdate exim_id_update
+ exim_lock exim_msgdate
# Targets for special-purpose configuration header builders