From f1d87437cc6336fb5427d041bac262f9296679ad Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 7 Dec 2013 13:48:46 +0100 Subject: [PATCH] update libapt-pkg4.12 symbols file also fixing the release script code to deal with 'set -e' mode while checking the symbols file. --- debian/libapt-pkg4.12.symbols | 82 +++++++++++++++++++++++++++++++++-- prepare-release | 6 +-- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 2b86c967..af43a7b0 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -698,11 +698,9 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"metaIndex::~metaIndex()@Base" 0.8.0 (c++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0 (c++)"pkgDPkgPM::DoTerminalPty(int)@Base" 0.8.0 - (c++)"pkgDPkgPM::DoDpkgStatusFd(int, int)@Base" 0.8.0 (c++)"pkgDPkgPM::WriteHistoryTag(std::basic_string, std::allocator > const&, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"pkgDPkgPM::WriteApportReport(char const*, char const*)@Base" 0.8.0 (c++)"pkgDPkgPM::RunScriptsWithPkgs(char const*)@Base" 0.8.0 - (c++)"pkgDPkgPM::ProcessDpkgStatusLine(int, char*)@Base" 0.8.0 (c++)"pkgDPkgPM::handleDisappearAction(std::basic_string, std::allocator > const&)@Base" 0.8.0 (c++)"pkgDPkgPM::Go(int)@Base" 0.8.0 (c++)"pkgDPkgPM::Reset()@Base" 0.8.0 @@ -1453,6 +1451,67 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"vtable for APT::PackageContainerInterface@Base" 0.8.16~exp9 (c++)"vtable for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9 (c++)"vtable for APT::VersionContainerInterface@Base" 0.8.16~exp9 +### rework of the packagemanager rework + (c++)"APT::Progress::PackageManager::ConffilePrompt(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Error(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::GetNumberTerminalRows()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::HandleSIGWINCH(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::GetPulseInterval()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::~PackageManager()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::ConffilePrompt(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Error(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::WriteToStatusFd(std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFactory()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::ConffilePrompt(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::Error(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::~PackageManagerProgressFd()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::PackageManagerProgressFd(int)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerText::~PackageManagerText()@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerText::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 + (c++)"APT::String::Strip(std::basic_string, std::allocator > const&)@Base" 0.9.13~exp1 + (c++)"APT::Upgrade::Upgrade(pkgDepCache&, int)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::BuildPackagesProgressMap()@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::DoDpkgStatusFd(int)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager*)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::ProcessDpkgStatusLine(char*)@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::StartPtyMagic()@Base" 0.9.13~exp1 + (c++)"pkgDPkgPM::StopPtyMagic()@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"typeinfo for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"typeinfo name for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManager@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 + (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 ### mixed stuff (c++)"GetListOfFilesInDir(std::basic_string, std::allocator > const&, bool)@Base" 0.8.16~exp13 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 @@ -1493,12 +1552,29 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1 (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1 (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1 + (c++)"CommandLine::GetCommand(CommandLine::Dispatch const*, unsigned int, char const* const*)@Base" 0.9.11 + (c++)"CommandLine::MakeArgs(char, char const*, char const*, unsigned long)@Base" 0.9.11 + (c++)"Configuration::Clear()@Base" 0.9.11 + (c++)"Glob(std::basic_string, std::allocator > const&, int)@Base" 0.9.11 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::GrpIterator const&)@Base" 0.9.11 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::PkgIterator const&)@Base" 0.9.11 + (c++)"APT::PackageContainerInterface::FromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string, std::allocator >, APT::CacheSetHelper&)@Base" 0.9.11 + (c++|optional=private)"pkgTagFile::Resize(unsigned long long)@Base" 0.9.11 + (c++)"pkgTagSection::pkgTagSection()@Base" 0.9.11 + (c++)"strv_length(char const**)@Base" 0.9.11 + (c++)"StringSplit(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, unsigned int)@Base" 0.9.11.3 + (c++)"pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState)@Base" 0.9.12 + (c++)"APT::String::Endswith(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.9.13.1 + (c++)"ExecFork(std::set, std::allocator >)@Base" 0.9.13.1 + (c++)"MergeKeepFdsFromConfiguration(std::set, std::allocator >&)@Base" 0.9.13.1 + (c++)"HashString::FromFile(std::basic_string, std::allocator >)@Base" 0.9.13.1 + (c++)"HashString::GetHashForFile(std::basic_string, std::allocator >) const@Base" 0.9.13.1 + (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts (c++|regex|optional=std)"^std::vector::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 - (c++|optional=std)"std::ctype::widen(char) const@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct(char const*, char const*, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 diff --git a/prepare-release b/prepare-release index 69ca8388..5dc5a63a 100755 --- a/prepare-release +++ b/prepare-release @@ -69,14 +69,14 @@ elif [ "$1" = 'library' ]; then librarysymbols() { echo "Checking $1 in version $2" local tmpfile=$(mktemp) - dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile + dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true echo '=== Missing symbols:' - grep '^+#MISSING' $tmpfile + grep '^+#MISSING' $tmpfile || true echo '=== New symbols:' grep '^+ ' $tmpfile | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do echo " (c++)\"${line}@Base\" $VERSION" done | sort -u - rm $tmpfile + rm -f $tmpfile } librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}" echo -- 2.20.1