diff -Naur ubuntu-original/apt-pkg/deb/dpkgpm.cc ubuntu/apt-pkg/deb/dpkgpm.cc --- ubuntu-original/apt-pkg/deb/dpkgpm.cc 2007-09-14 18:58:34.000000000 +0200 +++ ubuntu/apt-pkg/deb/dpkgpm.cc 2007-09-14 19:08:22.000000000 +0200 @@ -819,7 +819,11 @@ // setups fds fd_set rfds; - struct timeval tv; + struct timespec tv; + sigset_t sigmask; + sigset_t original_sigmask; + sigemptyset(&sigmask); + sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask); int select_ret; while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { @@ -842,8 +846,9 @@ if(master >= 0) FD_SET(master, &rfds); tv.tv_sec = 1; - tv.tv_usec = 0; - select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); + tv.tv_nsec = 0; + select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, + &tv, &original_sigmask); if (select_ret == 0) continue; else if (select_ret < 0 && errno == EINTR) diff -Naur ubuntu-original/debian/control ubuntu/debian/control --- ubuntu-original/debian/control 2007-09-14 18:58:34.000000000 +0200 +++ ubuntu/debian/control 2007-09-14 19:43:33.000000000 +0200 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), docbook-xsl (>= 1.72.0), docbook (>= 4.5), docbook-to-man (>= 1:2.0.0), xmlto (>= 0.0.18), doxygen (>= 1.5.3) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu diff -Naur ubuntu-original/debian/changelog ubuntu/debian/changelog --- ubuntu-original/debian/changelog 2007-09-14 18:58:34.000000000 +0200 +++ ubuntu/debian/changelog 2007-09-14 19:44:05.000000000 +0200 @@ -1,3 +1,13 @@ +apt (0.7.6ubuntu10) unstable; urgency=low + + * apt-pkg/deb/dpkgpm.{cc,h}: + - rewrite dpkgpm.cc to use pselect() instead of select() + to block signals during select() (LP: #134858) + * debian/control: + - Added tools for building documentation to Build-Depends + + -- Martin Emrich Fri, 14 Sep 2007 19:44:05 +0200 + apt (0.7.6ubuntu9) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: