gentoo auto-resync : 06:08:2022 - 08:09:34

4 files changed, 20 insertions, 2 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d01780a666b2..bdb0c95e380b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 06df7e2e05e1..3c4c2e0e4228 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -1,6 +1,7 @@
 AUX libodbc++-0.2.3-doxygen.patch 561 BLAKE2B 4b1813dc89760c0e70d36f853c21e5a830040fbb9128da4852c319b39a0e667533a515f8aaf17d6984e79cb35dcfc5c6e019b564d8bb6e5068c79ac20f9f2196 SHA512 226dcfe4cbe3bac7a3eba2f1eb1184115e71494a6063521e2a3c6944316a323c383c88891780c701ffaef3a3564248b58869b2ce5d1da753063579fca0f1b7d5
 AUX libodbc++-0.2.3-gcc41.patch 456 BLAKE2B ad9de19388669c345cd619ab95518e0a8c3ca4dc5b246bedc386c76ae45a1d89e5fe1a9c15e88e298e1f228fcf066a4e2c3237e60f75bc893c695aa3a518526a SHA512 9b758fab94141338f42d9ce4291620bb839f7d044a9020de90258b70ef0554bb128879a3008bbafae9e5fab2082170d1a2b9e631d5ea7ef5c23eaf03f14d7615
 AUX libodbc++-0.2.3-gcc44.patch 316 BLAKE2B a7c4e6466b9c3b0b4aca8ea4288df30a86e462835fba4b63cb1c7c1925732bcb75f5652d154bb7223fe135dccfc0308167e0f521e958b2ef3262a24d17820353 SHA512 6b8b6f57523e9128927530d95477c3c55a27c47836e7231e8017958bd20407e637fd4896015a2a3fbf2e47e3e44f7f3e933a28c4ac84fc600366b899462aebb1
+AUX libodbc++-0.2.3-musl-1.2.3-null.patch 425 BLAKE2B c9c8f34e2ee652ae47e412e7041b3b239630456de68b0df40f4574f250ca32be13a90d4b816b103bfea67d27dfc36e0809e6e2ec1315a62f38811f2ca676582e SHA512 5f15d9b270a17c52321ea0116fd974aff8d33a5b549be9a658c629dd0a0a77e5f1f2de1497112bba16f7ad847e8c7e67701764140b16ec07ee825352d0127fb1
 DIST libodbc++-0.2.5.tar.bz2 362310 BLAKE2B c0266eef510f8bee3c430b6998f68859955968ee26b1ce8b456a497f84ad5f67ef96b474de0966aa07ff4ef308737103887c949704635696b095fef0bbfe59f7 SHA512 cc2485a0dae8a3f548a26a759f1421133a0a23715296f632067f5967b61778ca64e1339e19a4de15d06fb80b4e43ec8ddb13ba170b70dd7202c4d07b5669c2c7
-EBUILD libodbc++-0.2.5-r3.ebuild 3057 BLAKE2B 409d8ada77ee515c23f816fe40c33af8c5983c702972f4e7da82c3ca0f26394d26fb604b2ef254f45759dbd72643764d57f92774ba2485f4336d9a8a5ed0b5a5 SHA512 cdf28a5390ca4077696a8bb75947f3065eba4d30c8d20cf9272b977e6834f1db7d573b93e9dae14ec4c6c627da7c18f04e44702eb8beaa0433746b1483c1062c
+EBUILD libodbc++-0.2.5-r3.ebuild 3106 BLAKE2B f526554b05cf0265ba4b9df1840f678ea53f4e37b02ab627ad5f5383843bafbe6e98dcef211d6da15da0e823d2680db2c1fbc8d7d01b69057721e8e650987167 SHA512 f051b373a417a9344eb993293e2143a4aa133e70e686fb5b3196cc05714aab18cc35cb2e179cc7f7debd7276bec7f629c322a9f41396849510e23f2fd049aec8
 MISC metadata.xml 298 BLAKE2B 9d1d9689809b96753443e12c0fc514870e80175c107e39a19acea88062e6dde12929cb9a871c711014509304040597166bb6415b0616478e78426166b0ec1205 SHA512 88fea8cac3d7b052868053c504d231e77e2319e6c42cad89c1de2f204e771fa4a3c2542f37ec540bc3973bda790cdf6df653971e1622f4e53c417618c2813fcb
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch
new file mode 100644
index 000000000000..f7d5a2e3436f
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch
@@ -0,0 +1,16 @@
+https://cgit.freebsd.org/ports/tree/databases/libodbc++/files/patch-src-datetime.cpp
+https://bugs.gentoo.org/855887
+
+(Given the source, possibly fixes libcxx too?)
+--- a/src/datetime.cpp
++++ b/src/datetime.cpp
+@@ -272,7 +272,7 @@
+ # endif
+ #endif
+       ,ODBCXX_STRING_CONST("%09d"),nanos_);
+-      buf[9] = NULL;// Terminate string
++      buf[9] = '\0';// Terminate string
+     ret+=ODBCXX_STRING(buf);
+   }
+   return ret;
+
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild
index 3241509b98af..b3ebd27f321a 100644
--- a/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.3-doxygen.patch
 	"${FILESDIR}"/${PN}-0.2.3-gcc41.patch
 	"${FILESDIR}"/${PN}-0.2.3-gcc44.patch
+	"${FILESDIR}"/${PN}-0.2.3-musl-1.2.3-null.patch
 )
 
 src_prepare() {