Control: tags 953458 + patch Control: tags 953458 + pending Control: tags 956685 + patch Control: tags 956685 + pending Control: tags 956686 + patch Control: tags 956686 + pending Control: tags 956687 + patch Control: tags 956687 + pending
Dear maintainer, I've prepared an NMU for sipxtapi (versioned as 3.3.0~test18+dfsg.1-0.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. (Attached is the diff only for the debian directory) Regards. -- tobi
diff -Naur sipxtapi-3.3.0~test17/debian/changelog sipxtapi-3.3.0~test18+dfsg.1/debian/changelog --- sipxtapi-3.3.0~test17/debian/changelog 2020-04-10 21:32:50.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/changelog 2020-04-18 09:06:33.009725343 +0200 @@ -1,7 +1,32 @@ +sipxtapi (3.3.0~test18+dfsg.1-0.1) unstable; urgency=medium + + [ Sudip Mukherjee ] + * Non-maintainer upload. + * Update to new upstream 3.3.0_test18. (Closes: #956686) + - Add Files-Excluded to repack source. + - Add patch to skip building examples. + - Remove patches applied upstream. + - Remove lintian overrides not needed. + - Update Standards-Version to 4.5.0 + - Use debhelper-compat. + - Update compat level to 12. + - Update priority to optional. + - Remove dependency on autotools-dev, dh-autoreconf. + - Remove copyright information of file removed by update. + - Fix copyright information for a header file. + - Use secure copyright format uri. + * Point Vcs to salsa. (Closes: #956685) + * Add watch file. (Closes: #956687) + + [ Tobias Frost ] + * Updating the sipxtapi Uploaders list (Closes: #953458). + + -- Sudip Mukherjee <[email protected]> Fri, 17 Apr 2020 18:18:54 +0100 + sipxtapi (3.3.0~test17-3.1) unstable; urgency=medium * Non-maintainer upload. - * Fix FTBFS. (Closes: #954547) + * Fix FTBFS. (Closes: #954547) -- Sudip Mukherjee <[email protected]> Fri, 10 Apr 2020 20:32:50 +0100 diff -Naur sipxtapi-3.3.0~test17/debian/compat sipxtapi-3.3.0~test18+dfsg.1/debian/compat --- sipxtapi-3.3.0~test17/debian/compat 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -Naur sipxtapi-3.3.0~test17/debian/control sipxtapi-3.3.0~test18+dfsg.1/debian/control --- sipxtapi-3.3.0~test17/debian/control 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/control 2020-04-18 09:06:46.542218857 +0200 @@ -1,13 +1,12 @@ Source: sipxtapi Section: libs -Priority: extra +Priority: optional Maintainer: Debian VoIP Team <[email protected]> -Uploaders: Daniel Pocock <[email protected]> -Build-Depends: debhelper (>= 9.0.0), libssl-dev, libcppunit-dev, autotools-dev, automake, libpcre3-dev, dpkg-dev (>= 1.16.1~), dh-autoreconf, libxerces-c-dev, pkg-config, libgsm1-dev, libspandsp-dev, libspeexdsp-dev, doxygen, libopus-dev +Build-Depends: debhelper-compat (= 12), libssl-dev, libcppunit-dev, automake, libpcre3-dev, dpkg-dev (>= 1.16.1~), libxerces-c-dev, pkg-config, libgsm1-dev, libspandsp-dev, libspeexdsp-dev, doxygen, libopus-dev Homepage: http://www.sipxtapi.org -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-voip/sipxtapi.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/sipxtapi.git +Standards-Version: 4.5.0 +Vcs-Git: https://salsa.debian.org/pkg-voip-team/sipxtapi.git +Vcs-Browser: https://salsa.debian.org/pkg-voip-team/sipxtapi Package: libsipxtapi Architecture: linux-any diff -Naur sipxtapi-3.3.0~test17/debian/copyright sipxtapi-3.3.0~test18+dfsg.1/debian/copyright --- sipxtapi-3.3.0~test17/debian/copyright 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/copyright 2020-04-17 19:18:13.000000000 +0200 @@ -1,7 +1,12 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sipXtapi Upstream-Contact: sipXtapi community <[email protected]> Source: https://github.com/sipXtapi/sipXtapi +Files-Excluded: *.dll + *.jar + */contrib + sipXcallLib/doc/sipXtapi/html + sipXcallLib/examples Files: * Copyright: 2004-2006, Pingtel Corp. @@ -31,7 +36,7 @@ 1993, Digital Equipment Corporation License: BSD-UC -Files: sipXtackLib/include/*.c +Files: sipXtackLib/include/resparse/poll.h Copyright: 1997, Peter Wemm <[email protected]> License: BSD-2 @@ -39,10 +44,6 @@ Copyright: 1991-2, RSA Data Security, Inc License: RSA -Files: build-aux/install-sh -Copyright: 1994, X Consortium -License: BSD-X - Files: sipXportLib/include/xmlparser/* Copyright: 2000-2002, Lee Thomason (www.grinninglizard.com) License: TINY @@ -127,29 +128,6 @@ These notices must be retained in any copies of any part of this documentation and/or software. -License: BSD-X - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - . - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - License: TINY This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any diff -Naur sipxtapi-3.3.0~test17/debian/files sipxtapi-3.3.0~test18+dfsg.1/debian/files --- sipxtapi-3.3.0~test17/debian/files 1970-01-01 01:00:00.000000000 +0100 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/files 2020-04-18 09:10:08.505632560 +0200 @@ -0,0 +1 @@ +sipxtapi_3.3.0~test18+dfsg.1-0.1_source.buildinfo libs optional diff -Naur sipxtapi-3.3.0~test17/debian/patches/add-license-rfc-4634.patch sipxtapi-3.3.0~test18+dfsg.1/debian/patches/add-license-rfc-4634.patch --- sipxtapi-3.3.0~test17/debian/patches/add-license-rfc-4634.patch 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/add-license-rfc-4634.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -diff --git a/sipXportLib/src/hmac-sha1/sha1.c b/sipXportLib/src/hmac-sha1/sha1.c -index 7b31453..6ea456b 100644 ---- a/sipXportLib/src/hmac-sha1/sha1.c -+++ b/sipXportLib/src/hmac-sha1/sha1.c -@@ -1,29 +1,23 @@ - /* -- * sha1.c (Obtained from rfc3471) -+ * sha1.c (Obtained from rfc 4634) - * - * Copyright (c) The Internet Society (2001). All Rights Reserved. - * -- * This document and translations of it may be copied and furnished to others, -- * and derivative works that comment on or otherwise explain it or assist in -- * its implementation may be prepared, copied, published and distributed, in -- * whole or in part, without restriction of any kind, provided that the above -- * copyright notice and this paragraph are included on all such copies and -- * derivative works. However, this document itself may not be modified in any -- * way, such as by removing the copyright notice or references to the Internet -- * Society or other Internet organizations, except as needed for the purpose -- * of developing Internet standards in which case the procedures for copyrights -- * defined in the Internet Standards process must be followed, or as required -- * to translate it into languages other than English. -+ * License from RFC 4634 s1.1: - * -- * The limited permissions granted above are perpetual and will not be revoked -- * by the Internet Society or its successors or assigns. -+ * Permission is granted for all uses, commercial and non-commercial, of -+ * the sample code found in Section 8. Royalty free license to use, -+ * copy, modify and distribute the software found in Section 8 is -+ * granted, provided that this document is identified in all material -+ * mentioning or referencing this software, and provided that -+ * redistributed derivative works do not contain misleading author or -+ * version information. -+ * -+ * The authors make no representations concerning either the -+ * merchantability of this software or the suitability of this software -+ * for any particular purpose. It is provided "as is" without express -+ * or implied warranty of any kind. - * -- * This document and the information contained herein is provided on an -- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK -- * FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -- * LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT -- * INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR -- * FITNESS FOR A PARTICULAR PURPOSE. - * - * Description: - * This file implements the Secure Hashing Algorithm 1 as -@@ -408,4 +402,4 @@ void SHA1PadMessage(SHA1Context *context) - context->Message_Block[62] = (unsigned char)((context->Length_Low >> 8) & 0xFF); - context->Message_Block[63] = (unsigned char)((context->Length_Low) & 0xFF); - SHA1ProcessMessageBlock(context); --} -\ No newline at end of file -+} -diff --git a/sipXportLib/src/hmac-sha1/sha1.h b/sipXportLib/src/hmac-sha1/sha1.h -index d37eb2a..f47ce01 100644 ---- a/sipXportLib/src/hmac-sha1/sha1.h -+++ b/sipXportLib/src/hmac-sha1/sha1.h -@@ -1,29 +1,22 @@ - /* -- * sha1.h (Obtained from rfc3471) -- * -- * Copyright (c) The Internet Society (2001). All Rights Reserved. -+ * sha1.h (Obtained from rfc 4634) - * -- * This document and translations of it may be copied and furnished to others, -- * and derivative works that comment on or otherwise explain it or assist in -- * its implementation may be prepared, copied, published and distributed, in -- * whole or in part, without restriction of any kind, provided that the above -- * copyright notice and this paragraph are included on all such copies and -- * derivative works. However, this document itself may not be modified in any -- * way, such as by removing the copyright notice or references to the Internet -- * Society or other Internet organizations, except as needed for the purpose -- * of developing Internet standards in which case the procedures for copyrights -- * defined in the Internet Standards process must be followed, or as required -- * to translate it into languages other than English. -+ * Copyright (c) The Internet Society (2001). All Rights Reserved. - * -- * The limited permissions granted above are perpetual and will not be revoked -- * by the Internet Society or its successors or assigns. -+ * License from RFC 4634 s1.1: - * -- * This document and the information contained herein is provided on an -- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK -- * FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -- * LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT -- * INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR -- * FITNESS FOR A PARTICULAR PURPOSE. -+ * Permission is granted for all uses, commercial and non-commercial, of -+ * the sample code found in Section 8. Royalty free license to use, -+ * copy, modify and distribute the software found in Section 8 is -+ * granted, provided that this document is identified in all material -+ * mentioning or referencing this software, and provided that -+ * redistributed derivative works do not contain misleading author or -+ * version information. -+ * -+ * The authors make no representations concerning either the -+ * merchantability of this software or the suitability of this software -+ * for any particular purpose. It is provided "as is" without express -+ * or implied warranty of any kind. - * - * Description: - * This is the header file for code which implements the Secure diff -Naur sipxtapi-3.3.0~test17/debian/patches/cppunit.patch sipxtapi-3.3.0~test18+dfsg.1/debian/patches/cppunit.patch --- sipxtapi-3.3.0~test17/debian/patches/cppunit.patch 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/cppunit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -Description: use PKG_CHECK_MODULES instead of AM_PATH_CPPUNIT -Author: Rene Engelhard <[email protected]> -Bug-Debian: https://bugs.debian.org/862127 -Origin: vendor -Forwarded: no -Last-Update: 2017-05-15 - ---- sipxtapi-3.3.0~test17.orig/configure.ac -+++ sipxtapi-3.3.0~test17/configure.ac -@@ -72,7 +72,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li - - # Check CPPUnit - begin - # can't be encapsulated as a function due to search path ordering issues --AM_PATH_CPPUNIT(1.9, -+PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9, I - [ SIPX_UNIT_TARGET="sipxunit" ], - [ SIPX_UNIT_TARGET="sipxportunit" - CPPUNIT_CFLAGS=' -DNO_CPPUNIT -I$(top_srcdir)/sipXportLib/src/test/sipxportunit ' diff -Naur sipxtapi-3.3.0~test17/debian/patches/fix-gcc-6-compilation.patch sipxtapi-3.3.0~test18+dfsg.1/debian/patches/fix-gcc-6-compilation.patch --- sipxtapi-3.3.0~test17/debian/patches/fix-gcc-6-compilation.patch 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/fix-gcc-6-compilation.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -Description: Fix FTBFS with GCC 6 - Fix a minor, possibly unintentional, type casting error to fix a - compilation error with GCC 6. The data being initialized is unsigned - char where as the array is char. The array is being later type - casted to (unsigned char *). So, it is appropriate for the array to - be unsigned char[]. - . - Currently the upstream repository and site are unreachable. -Author: Sunil Mohan Adapa <[email protected]> -Bug-Debian: https://bugs.debian.org/811725 -Forwarded: <no|not-needed|url proving that it has been forwarded> -Last-Update: 2016-08-30 - ---- sipxtapi-3.3.0~test17.orig/sipXportLib/src/os/OsEncryption.cpp -+++ sipxtapi-3.3.0~test17/sipXportLib/src/os/OsEncryption.cpp -@@ -55,7 +55,7 @@ - // EXTERNAL VARIABLES - - // CONSTANTS --static const char gSalt[] = -+static const unsigned char gSalt[] = - { - (unsigned char)0xc9, (unsigned char)0x36, (unsigned char)0x78, (unsigned char)0x99, - (unsigned char)0x52, (unsigned char)0x3e, (unsigned char)0xea, (unsigned char)0xf2 diff -Naur sipxtapi-3.3.0~test17/debian/patches/openssl11.patch sipxtapi-3.3.0~test18+dfsg.1/debian/patches/openssl11.patch --- sipxtapi-3.3.0~test17/debian/patches/openssl11.patch 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/openssl11.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,269 +0,0 @@ -diff --git a/sipXportLib/include/os/OsEncryption.h b/sipXportLib/include/os/OsEncryption.h -index a21497d..fbe65ca 100644 ---- a/sipXportLib/include/os/OsEncryption.h -+++ b/sipXportLib/include/os/OsEncryption.h -@@ -118,7 +118,7 @@ class OsEncryption - #if defined (OSENCRYPTION) - X509_ALGOR *mAlgorithm; - -- EVP_CIPHER_CTX mContext; -+ EVP_CIPHER_CTX *mContext; - #endif - - unsigned char *mSalt; // defeats brute force decryption via appling dictionary -diff --git a/sipXportLib/include/utl/UtlCryptoKey.h b/sipXportLib/include/utl/UtlCryptoKey.h -index d1b31be..0a1be73 100644 ---- a/sipXportLib/include/utl/UtlCryptoKey.h -+++ b/sipXportLib/include/utl/UtlCryptoKey.h -@@ -23,7 +23,7 @@ - // TYPEDEFS - typedef struct rsa_st RSA; - typedef struct evp_cipher_st EVP_CIPHER; --typedef struct env_md_st EVP_MD; -+typedef struct evp_md_st EVP_MD; - - // DEFINES - // MACROS -diff --git a/sipXportLib/src/os/OsEncryption.cpp b/sipXportLib/src/os/OsEncryption.cpp -index b875d38..cd32f31 100644 ---- a/sipXportLib/src/os/OsEncryption.cpp -+++ b/sipXportLib/src/os/OsEncryption.cpp -@@ -187,17 +187,18 @@ OsStatus OsEncryption::init(Direction direction) - { - ERR_clear_error(); - -- SSLeay_add_all_algorithms(); -+ SSL_library_init(); - mAlgorithm = PKCS5_pbe_set(NID_pbeWithMD5AndDES_CBC, - PKCS5_DEFAULT_ITER, mSalt, mSaltLen); - - if (mAlgorithm != NULL) - { -- EVP_CIPHER_CTX_init(&(mContext)); -+ mContext = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(mContext); - if (EVP_PBE_CipherInit(mAlgorithm->algorithm, (const char *)mKey, mKeyLen, -- mAlgorithm->parameter, &(mContext), (int)direction)) -+ mAlgorithm->parameter, mContext, (int)direction)) - { -- int blockSize = EVP_CIPHER_CTX_block_size(&mContext); -+ int blockSize = EVP_CIPHER_CTX_block_size(mContext); - int allocLen = mDataLen + mHeaderLen + blockSize + 1; // plus 1 for null terminator on decrypt - mResults = (unsigned char *)OPENSSL_malloc(allocLen); - if (mResults == NULL) -@@ -268,11 +269,11 @@ OsStatus OsEncryption::crypto(Direction direction) - } - - int outLenPart1 = 0; -- if (EVP_CipherUpdate(&(mContext), out, &outLenPart1, in, inLen)) -+ if (EVP_CipherUpdate(mContext, out, &outLenPart1, in, inLen)) - { - out += outLenPart1; - int outLenPart2 = 0; -- if (EVP_CipherFinal(&(mContext), out, &outLenPart2)) -+ if (EVP_CipherFinal(mContext, out, &outLenPart2)) - { - outLen += outLenPart1 + outLenPart2; - retval = OS_SUCCESS; -diff --git a/sipXportLib/src/os/OsSSL.cpp b/sipXportLib/src/os/OsSSL.cpp -index bb30d7b..f6d786b 100644 ---- a/sipXportLib/src/os/OsSSL.cpp -+++ b/sipXportLib/src/os/OsSSL.cpp -@@ -505,15 +505,16 @@ void OsSSL::logError(const OsSysLogFacility facility, - void OsSSL::dumpCipherList() - { - char humanReadableName[1024]; -- SSL_CIPHER *cipher = NULL; -+ STACK_OF(SSL_CIPHER) *sk = SSL_CTX_get_ciphers(mCTX); -+ const SSL_CIPHER *cipher = NULL; - int cipherCount = 0; - const char* tokenName = NULL; - -- while(cipherCount < sk_SSL_CIPHER_num(mCTX->cipher_list)) -+ while(cipherCount < sk_SSL_CIPHER_num(sk)) - { - - // Get a cipher from the context -- cipher = sk_SSL_CIPHER_value(mCTX->cipher_list, cipherCount); -+ cipher = sk_SSL_CIPHER_value(sk, cipherCount); - - if(cipher) - { -diff --git a/sipXportLib/src/utl/UtlCryptoKey.cpp b/sipXportLib/src/utl/UtlCryptoKey.cpp -index ee8181c..6e80ae5 100644 ---- a/sipXportLib/src/utl/UtlCryptoKey.cpp -+++ b/sipXportLib/src/utl/UtlCryptoKey.cpp -@@ -203,34 +203,35 @@ int UtlCryptoKey::computeDigest(const unsigned char* pSrc, - - *pDestLen = 0; - -- EVP_MD_CTX mdctx; -- EVP_MD_CTX_init(&mdctx); -+ EVP_MD_CTX *mdctx; -+ mdctx = EVP_MD_CTX_new(); -+ EVP_MD_CTX_init(mdctx); - - OpenSSL_add_all_digests(); - -- if (!EVP_DigestInit_ex(&mdctx, spMdAlg, NULL)) -+ if (!EVP_DigestInit_ex(mdctx, spMdAlg, NULL)) - { - osPrintf("*****EVP_DigestInit_ex failed"); -- EVP_MD_CTX_cleanup(&mdctx); -+ EVP_MD_CTX_free(mdctx); - return 0; - } - -- if (!EVP_DigestUpdate(&mdctx, pSrc, srcLen)) -+ if (!EVP_DigestUpdate(mdctx, pSrc, srcLen)) - { - osPrintf("*****EVP_DigestUpdate failed"); -- EVP_MD_CTX_cleanup(&mdctx); -+ EVP_MD_CTX_free(mdctx); - return 0; - } - -- if (!EVP_DigestFinal_ex(&mdctx, pDest, (unsigned*)pDestLen)) -+ if (!EVP_DigestFinal_ex(mdctx, pDest, (unsigned*)pDestLen)) - { - osPrintf("*****EVP_DigestFinal_ex failed"); -- EVP_MD_CTX_cleanup(&mdctx); -+ EVP_MD_CTX_free(mdctx); - *pDestLen = 0; - return 0; - } - -- EVP_MD_CTX_cleanup(&mdctx); -+ EVP_MD_CTX_free(mdctx); - return *pDestLen; - } - -@@ -517,4 +518,4 @@ UtlCryptoData* UtlCryptoKey::base64Decode(const UtlString& pSrc) - return pDest; - } - --#endif -\ No newline at end of file -+#endif -diff --git a/sipXportLib/src/utl/UtlCryptoKeySym.cpp b/sipXportLib/src/utl/UtlCryptoKeySym.cpp -index 2d4e166..34616df 100644 ---- a/sipXportLib/src/utl/UtlCryptoKeySym.cpp -+++ b/sipXportLib/src/utl/UtlCryptoKeySym.cpp -@@ -151,15 +151,17 @@ int UtlCryptoKeySym::encrypt(const unsigned char* pSrc, - return 0; - } - -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -+ EVP_CIPHER_CTX *ctx; -+ ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx); - -- if (!EVP_EncryptInit_ex(&ctx, mpCipher, NULL, -+ if (!EVP_EncryptInit_ex(ctx, mpCipher, NULL, - mpKey->data(), mpIv->data())) - { - osPrintf("*****EVP_EncryptInit_ex failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - -@@ -167,28 +169,31 @@ int UtlCryptoKeySym::encrypt(const unsigned char* pSrc, - - int bytesWritten = 0; - unsigned char* pDestTail = pDest; -- if (!EVP_EncryptUpdate(&ctx, pDestTail, &bytesWritten, pSrc, srcLen)) -+ if (!EVP_EncryptUpdate(ctx, pDestTail, &bytesWritten, pSrc, srcLen)) - { - osPrintf("*****EVP_EncryptUpdate failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - - pDestTail += bytesWritten; - int bytesFinal = 0; -- if (!EVP_EncryptFinal_ex(&ctx, pDestTail, &bytesFinal)) -+ if (!EVP_EncryptFinal_ex(ctx, pDestTail, &bytesFinal)) - { - osPrintf("*****EVP_EncryptFinal_ex failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - - // How many total bytes did we write to pDest? - *pDestLen = bytesWritten + bytesFinal; - -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - setLastError(0); - return *pDestLen; - } -@@ -216,15 +221,17 @@ int UtlCryptoKeySym::decrypt(const unsigned char* pSrc, - return 0; - } - -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -+ EVP_CIPHER_CTX *ctx; -+ ctx = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(ctx); - -- if (!EVP_DecryptInit_ex(&ctx, mpCipher, NULL, -+ if (!EVP_DecryptInit_ex(ctx, mpCipher, NULL, - mpKey->data(), mpIv->data())) - { - osPrintf("*****EVP_DecryptInit_ex failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - -@@ -232,28 +239,31 @@ int UtlCryptoKeySym::decrypt(const unsigned char* pSrc, - - int bytesWritten = 0; - unsigned char* pDestTail = pDest; -- if (!EVP_DecryptUpdate(&ctx, pDestTail, &bytesWritten, pSrc, srcLen)) -+ if (!EVP_DecryptUpdate(ctx, pDestTail, &bytesWritten, pSrc, srcLen)) - { - osPrintf("*****EVP_DecryptUpdate failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - - pDestTail += bytesWritten; - int bytesFinal = 0; -- if (!EVP_DecryptFinal_ex(&ctx, pDestTail, &bytesFinal)) -+ if (!EVP_DecryptFinal_ex(ctx, pDestTail, &bytesFinal)) - { - osPrintf("*****EVP_DecryptFinal_ex failed"); - setLastError(ERR_get_error()); -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - return 0; - } - - // How many total bytes did we write to pDest? - *pDestLen = bytesWritten + bytesFinal; - -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); -+ EVP_CIPHER_CTX_free(ctx); - setLastError(0); - return *pDestLen; - } diff -Naur sipxtapi-3.3.0~test17/debian/patches/remove_examples.patch sipxtapi-3.3.0~test18+dfsg.1/debian/patches/remove_examples.patch --- sipxtapi-3.3.0~test17/debian/patches/remove_examples.patch 1970-01-01 01:00:00.000000000 +0100 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/remove_examples.patch 2020-04-17 18:35:10.000000000 +0200 @@ -0,0 +1,28 @@ +Description: remove examples + examples were removed as part of repacking the source, skip + building examples. + +--- + +--- sipxtapi-3.3.0~test18+dfsg.1.orig/configure.ac ++++ sipxtapi-3.3.0~test18+dfsg.1/configure.ac +@@ -189,8 +189,6 @@ AC_CONFIG_FILES([ + bin/Makefile + sipXcallLib/Makefile + sipXcallLib/doc/Makefile +- sipXcallLib/examples/Makefile +- sipXcallLib/examples/sipXezPhone/Makefile + sipXcallLib/include/Makefile + sipXcallLib/src/Makefile + sipXcallLib/src/test/Makefile +--- sipxtapi-3.3.0~test18+dfsg.1.orig/sipXcallLib/Makefile.am ++++ sipxtapi-3.3.0~test18+dfsg.1/sipXcallLib/Makefile.am +@@ -9,7 +9,7 @@ EXTRA_DIST = \ + config/sipXcommon.am.inc \ + CONTRIBUTORS + +-unconditional_SUBDIRS = . src examples include ++unconditional_SUBDIRS = . src include + # bin is not really needed now that we have a top-level build system + #unconditional_SUBDIRS += bin + diff -Naur sipxtapi-3.3.0~test17/debian/patches/series sipxtapi-3.3.0~test18+dfsg.1/debian/patches/series --- sipxtapi-3.3.0~test17/debian/patches/series 2020-04-10 21:31:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/patches/series 2020-04-17 18:34:05.000000000 +0200 @@ -1,5 +1,2 @@ -fix-gcc-6-compilation.patch -openssl11.patch -cppunit.patch -add-license-rfc-4634.patch fix_gettid.patch +remove_examples.patch diff -Naur sipxtapi-3.3.0~test17/debian/source/lintian-overrides sipxtapi-3.3.0~test18+dfsg.1/debian/source/lintian-overrides --- sipxtapi-3.3.0~test17/debian/source/lintian-overrides 2020-04-10 21:15:11.000000000 +0200 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/source/lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# RFC 4634 includes a dedicated license for sipXportLib/src/hmac-sha1/sha1.* -sipxtapi source: license-problem-non-free-RFC sipXportLib/src/hmac-sha1/sha1.c -sipxtapi source: license-problem-non-free-RFC sipXportLib/src/hmac-sha1/sha1.h -sipxtapi source: license-problem-non-free-RFC debian/patches/add-license-rfc-4634.patch diff -Naur sipxtapi-3.3.0~test17/debian/watch sipxtapi-3.3.0~test18+dfsg.1/debian/watch --- sipxtapi-3.3.0~test17/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ sipxtapi-3.3.0~test18+dfsg.1/debian/watch 2020-04-17 18:31:12.000000000 +0200 @@ -0,0 +1,5 @@ +version=4 +opts=uversionmangle=s/_/~/,\ + filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/sipxtapi-$1\.tar\.gz/,\ + repacksuffix=+dfsg,dversionmangle=s/\+dfsg(\.?\d+)?$// \ + https://github.com/sipXtapi/sipXtapi/tags .*/v?(\d\S+)\.tar\.gz
