diff -u pump-0.8.24/pump.c pump-0.8.24/pump.c --- pump-0.8.24/pump.c +++ pump-0.8.24/pump.c @@ -555,7 +555,11 @@ listen(sock, 5); - write(conn, &c, 1); + if (write(conn, &c, 1) < 0) { + syslog(LOG_ERR, "failed to write to connection: %s\n", + strerror(errno)); + exit(1); + } out: close(conn); @@ -731,7 +735,8 @@ if (!connect(sock_in, (struct sockaddr *) &addr_in, sizeof(addr_in))) { char c; - read(sock_in, &c, 1); + if( read(sock_in, &c, 1) < 0) {} + close(sock_in); goto again; } @@ -774,7 +779,11 @@ exit(1); } - chdir("/"); + if( chdir("/") < 0 ) { + syslog(LOG_ERR, "couldn't chdir to root: %s\n", strerror(errno)); + exit(1); + } + umask(077); if (bind(sock, (struct sockaddr *) &addr, addrLength)) { syslog(LOG_ERR, "bind to %s failed: %s\n", CONTROLSOCKET, diff -u pump-0.8.24/debian/changelog pump-0.8.24/debian/changelog --- pump-0.8.24/debian/changelog +++ pump-0.8.24/debian/changelog @@ -1,3 +1,10 @@ +pump (0.8.24-5ubuntu1) jaunty; urgency=low + + * Resolve FTBFS on Jaunty because of -D_FORTIFY_SOURCE=2. + Thanks to Cesare Tirabassi for the patch. (LP: #309848) + + -- Brian Murray Thu, 09 Apr 2009 18:25:31 -0700 + pump (0.8.24-5) unstable; urgency=low * QA upload. diff -u pump-0.8.24/debian/control pump-0.8.24/debian/control --- pump-0.8.24/debian/control +++ pump-0.8.24/debian/control @@ -1,7 +1,8 @@ Source: pump Section: admin Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group Standards-Version: 3.8.0 Build-Depends: libpopt-dev, debhelper (>= 5)