| 1 | diff -u -r ../apt-1.4.8/apt-pkg/deb/dpkgpm.cc ./apt-pkg/deb/dpkgpm.cc |
| 2 | --- ../apt-1.4.8/apt-pkg/deb/dpkgpm.cc 2017-09-13 18:47:33.000000000 +0200 |
| 3 | +++ ./apt-pkg/deb/dpkgpm.cc 2017-12-29 01:29:53.178628587 +0100 |
| 4 | @@ -1281,8 +1281,13 @@ |
| 5 | sigemptyset(&d->sigmask); |
| 6 | sigaddset(&d->sigmask, SIGTTOU); |
| 7 | sigprocmask(SIG_BLOCK,&d->sigmask, &d->original_sigmask); |
| 8 | +#ifndef __ANDROID__ |
| 9 | + // This fails on Android 8.0 - see |
| 10 | + // https://github.com/termux/termux-packages/issues/1359 |
| 11 | + // We silence the warning here to avoid it being shown for every apt operation. |
| 12 | if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw_tt) == -1) |
| 13 | _error->Errno("tcsetattr", "Setting in Start via TCSAFLUSH for stdin failed!"); |
| 14 | +#endif |
| 15 | sigprocmask(SIG_SETMASK, &d->original_sigmask, NULL); |
| 16 | |
| 17 | } |
| 18 | @@ -1361,8 +1366,13 @@ |
| 19 | } |
| 20 | if(d->master >= 0) |
| 21 | { |
| 22 | +#ifndef __ANDROID__ |
| 23 | + // This fails on Android 8.0 - see |
| 24 | + // https://github.com/termux/termux-packages/issues/1359 |
| 25 | + // We silence the warning here to avoid it being shown for every apt operation. |
| 26 | if (d->tt_is_valid == true && tcsetattr(STDIN_FILENO, TCSAFLUSH, &d->tt) == -1) |
| 27 | _error->FatalE("tcsetattr", "Setting in Stop via TCSAFLUSH for stdin failed!"); |
| 28 | +#endif |
| 29 | close(d->master); |
| 30 | d->master = -1; |
| 31 | } |