Control: tags 954547 + patch Control: tags 954547 + pending Dear maintainer,
I've prepared an NMU for sipxtapi (versioned as 3.3.0~test17-3.1) and uploaded it to mentors for sponsoring. Please feel free to tell me if I should remove it. -- Regards Sudip diff -Nru sipxtapi-3.3.0~test17/debian/changelog sipxtapi-3.3.0~test17/debian/changelog --- sipxtapi-3.3.0~test17/debian/changelog 2018-04-13 21:49:44.000000000 +0100 +++ sipxtapi-3.3.0~test17/debian/changelog 2020-04-10 20:32:50.000000000 +0100 @@ -1,3 +1,10 @@ +sipxtapi (3.3.0~test17-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS. (Closes: #954547) + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Fri, 10 Apr 2020 20:32:50 +0100 + sipxtapi (3.3.0~test17-3) unstable; urgency=high [ Rene Engelhard ] diff -Nru sipxtapi-3.3.0~test17/debian/patches/fix_gettid.patch sipxtapi-3.3.0~test17/debian/patches/fix_gettid.patch --- sipxtapi-3.3.0~test17/debian/patches/fix_gettid.patch 1970-01-01 01:00:00.000000000 +0100 +++ sipxtapi-3.3.0~test17/debian/patches/fix_gettid.patch 2020-04-10 20:32:47.000000000 +0100 @@ -0,0 +1,39 @@ +Description: Fix FTBFS + Latest glibc has defined gettid() and as a result there was a conflict. + Rename gettid() to sys_gettid() to use our own gettid instead of using + the gettid() from glibc. + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> +Bug-Debian: https://bugs.debian.org/954547 + +--- + +--- sipxtapi-3.3.0~test17.orig/sipXportLib/src/os/linux/OsTaskLinux.cpp ++++ sipxtapi-3.3.0~test17/sipXportLib/src/os/linux/OsTaskLinux.cpp +@@ -27,7 +27,7 @@ + #include <sys/mman.h> + #undef _P1003_1B_VISIBLE + +-// Include to access gettid() syscall for debug purposes ++// Include to access sys_gettid() syscall for debug purposes + #include <sys/syscall.h> + + // APPLICATION INCLUDES +@@ -49,7 +49,7 @@ + + // EXTERNAL FUNCTIONS + #ifndef ANDROID // [ +-static inline int gettid() {return syscall(SYS_gettid);} ++static inline int sys_gettid() {return syscall(SYS_gettid);} + #endif // !ANDROID ] + + // EXTERNAL VARIABLES +@@ -783,7 +783,7 @@ void * OsTaskLinux::taskEntry(void* arg) + + // Log Thread ID for debug purposes + OsSysLog::add(FAC_KERNEL, PRI_DEBUG, "OsTaskLinux::taskEntry: Started task %s with lwp=%d, pid=%d", +- pTask->mName.data(), gettid(), getpid()); ++ pTask->mName.data(), sys_gettid(), getpid()); + + #ifdef ANDROID // [ + pTask->setPriority(pTask->mPriority); diff -Nru sipxtapi-3.3.0~test17/debian/patches/series sipxtapi-3.3.0~test17/debian/patches/series --- sipxtapi-3.3.0~test17/debian/patches/series 2018-04-13 21:49:44.000000000 +0100 +++ sipxtapi-3.3.0~test17/debian/patches/series 2020-04-10 20:31:11.000000000 +0100 @@ -2,3 +2,4 @@ openssl11.patch cppunit.patch add-license-rfc-4634.patch +fix_gettid.patch
