diff mbox series

pbzip2: Do not depend on char_trait template from stdlib

Message ID 20250718174418.12850-1-raj.khem@gmail.com
State New
Headers show
Series pbzip2: Do not depend on char_trait template from stdlib | expand

Commit Message

Khem Raj July 18, 2025, 5:44 p.m. UTC
This implementation is not part of standard and some implementations
e.g. libc++ have removed it starting with 19.x release

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...std-char_traits-template-from-stdlib.patch | 116 ++++++++++++++++++
 meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb |   1 +
 2 files changed, 117 insertions(+)
 create mode 100644 meta/recipes-extended/pbzip2/pbzip2/0001-Do-not-rely-on-std-char_traits-template-from-stdlib.patch
diff mbox series

Patch

diff --git a/meta/recipes-extended/pbzip2/pbzip2/0001-Do-not-rely-on-std-char_traits-template-from-stdlib.patch b/meta/recipes-extended/pbzip2/pbzip2/0001-Do-not-rely-on-std-char_traits-template-from-stdlib.patch
new file mode 100644
index 00000000000..21c9145a1ad
--- /dev/null
+++ b/meta/recipes-extended/pbzip2/pbzip2/0001-Do-not-rely-on-std-char_traits-template-from-stdlib.patch
@@ -0,0 +1,116 @@ 
+From c9f1af117557ad5d75df9e37bf3fbb1185f67de2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 18 Jul 2025 10:26:06 -0700
+Subject: [PATCH] Do not rely on std::char_traits template from stdlib
+
+standard never required the base template for
+char_traits to any type but it was given for
+convenience purposes. Nowadays, at least in LLVM's
+libcxx version 19+ it got removed [1].
+
+GCC might follow the same path at some point so
+porting it away from char_traits might be a good
+idea.
+
+The fix is applied to FreeBSD [2] [3]
+
+Reported issue [4]
+
+[1] https://reviews.llvm.org/D138307
+[2] https://cgit.freebsd.org/ports/commit/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp?id=29c80f114ea6cc60be39502339572af8c35ac440
+[3] https://cgit.freebsd.org/ports/commit/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp?id=89f872ec2ccf488f24cd9daca2e0d1f80e7ee429
+[4] https://github.com/ruanhuabin/pbzip2/issues/1
+
+Upstream-Status: Inactive-Upstream [lastcommit: 2015-12-17]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ BZ2StreamScanner.cpp | 21 +++++++++++----------
+ BZ2StreamScanner.h   |  6 +++---
+ 2 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/BZ2StreamScanner.cpp b/BZ2StreamScanner.cpp
+index a134712..f32a321 100644
+--- a/BZ2StreamScanner.cpp
++++ b/BZ2StreamScanner.cpp
+@@ -42,15 +42,15 @@ int BZ2StreamScanner::init( int hInFile, size_t inBuffCapacity )
+ {
+ 	dispose();
+ 
+-	CharType bz2header[] = "BZh91AY&SY";
+-	// zero-terminated string
++	CharType bz2header[] =
++		{ 'B', 'Z', 'h', '9', '1', 'A', 'Y', '&', 'S', 'Y' };
+ 	CharType bz2ZeroHeader[] =
+-		{ 'B', 'Z', 'h', '9', 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, 0 };
++		{ 'B', 'Z', 'h', '9', 0x17, 0x72, 0x45, 0x38, 0x50, 0x90 };
+ 
+ 	_hInFile = hInFile;
+ 	_eof = false;
+-	_bz2Header = bz2header;
+-	_bz2HeaderZero = bz2ZeroHeader;
++	_bz2Header.assign(begin(bz2header), end(bz2header));
++	_bz2HeaderZero.assign(begin(bz2ZeroHeader), end(bz2ZeroHeader));
+ 	_bz2HeaderFound = false;
+ 	_inBuffCapacity = 0;
+ 	_errState = 0;
+@@ -361,7 +361,7 @@ BZ2StreamScanner::CharType * BZ2StreamScanner::locateHeaderPrefixInBuff()
+ 			_errState |= ERR_INVALID_FILE_FORMAT;
+ 			_inBuffSearchPtr = getInBuffEnd();
+ 		}
+-		else if ( _bz2Header.compare( 0, prefixLen, getInBuffSearchPtr(), prefixLen ) == 0 )
++		else if ( equal( _bz2Header.begin(), _bz2Header.begin() + prefixLen, getInBuffSearchPtr() ) )
+ 		{
+ 			// header prefix found
+ 		}
+@@ -416,7 +416,7 @@ BZ2StreamScanner::CharType * BZ2StreamScanner::searchNextHeaderInBuff()
+ 	while ( !failed() && ( getUnsearchedCount() >= getHeaderSize() ) )
+ 	{
+ 		// _inBuffSearchPtr += prefixLen;
+-		basic_string<CharType> * pHdr = NULL;
++		vector<CharType> * pHdr = NULL;
+ 
+ 		if ( getInBuffSearchPtr()[hsp] == _bz2Header[hsp] )
+ 		{
+@@ -441,13 +441,14 @@ BZ2StreamScanner::CharType * BZ2StreamScanner::searchNextHeaderInBuff()
+ 				(*pHdr)[prefixLen] = bwtSizeChar;
+ 
+ 				// compare the remaining part of magic header
+-				int cmpres = pHdr->compare( hsp, pHdr->size() - hsp,
+-						getInBuffSearchPtr() + hsp, pHdr->size() - hsp );
++				bool cmpres = equal( pHdr->begin() + hsp, pHdr->end(),
++						getInBuffSearchPtr() + hsp );
++
+ 
+ 				#ifdef PBZIP_DEBUG
+ 				fprintf( stderr, "   searchNextHeaderInBuff:cmpres=%d\n", cmpres );
+ 				#endif
+-				if ( cmpres == 0 )
++				if ( cmpres )
+ 				{
+ 					_searchStatus = true;
+ 					#ifdef PBZIP_DEBUG
+diff --git a/BZ2StreamScanner.h b/BZ2StreamScanner.h
+index d3729fe..32697cb 100644
+--- a/BZ2StreamScanner.h
++++ b/BZ2StreamScanner.h
+@@ -44,7 +44,7 @@ public:
+ 
+ 	size_t getInBuffSize() const { return ( _inBuffEnd - _inBuff ); }
+ 	size_t getInBuffCapacity() const { return _inBuffCapacity; }
+-	const basic_string<CharType> & getHeader() const { return _bz2Header; }
++	const vector<CharType> & getHeader() const { return _bz2Header; }
+ 	size_t getHeaderSize() const { return _bz2Header.size(); }
+ 	int getErrState() const { return _errState; }
+ 	bool failed() { return ( _errState != 0 ); }
+@@ -125,8 +125,8 @@ private:
+ 	int _hInFile; // input file descriptor
+ 	bool _eof;
+ 
+-	basic_string<CharType> _bz2Header;
+-	basic_string<CharType> _bz2HeaderZero;
++	vector<CharType> _bz2Header;
++	vector<CharType> _bz2HeaderZero;
+ 	bool _bz2HeaderFound;
+ 	bool _searchStatus;
+ 
diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
index f95400998cd..063f600ba9f 100644
--- a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
+++ b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
@@ -13,6 +13,7 @@  DEPENDS:append:class-native = " bzip2-replacement-native"
 
 SRC_URI = "https://launchpad.net/${BPN}/1.1/${PV}/+download/${BP}.tar.gz \
            file://0001-pbzip2-Fix-invalid-suffix-on-literal-C-11-warning.patch \
+           file://0001-Do-not-rely-on-std-char_traits-template-from-stdlib.patch \
            "
 
 SRC_URI[sha256sum] = "8fd13eaaa266f7ee91f85c1ea97c86d9c9cc985969db9059cdebcb1e1b7bdbe6"