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,14 @@ +pump (0.8.24-5ubuntu1) karmic; urgency=low + + [ Brian Murray ] + * Resolve FTBFS on Jaunty because of -D_FORTIFY_SOURCE=2. + Thanks to Cesare Tirabassi for the patch. (LP: #309848) + + [ Ilya Barygin ] + * Build with -fno-strict-aliasing to fix FTBFS with gcc 4.4. + + -- Ilya Barygin Tue, 13 Oct 2009 20:27:40 +0400 + pump (0.8.24-5) unstable; urgency=low * QA upload. diff -u pump-0.8.24/debian/Makefile.build pump-0.8.24/debian/Makefile.build --- pump-0.8.24/debian/Makefile.build +++ pump-0.8.24/debian/Makefile.build @@ -1,5 +1,5 @@ include $(SHOME)/Makefile -DEB_CFLAGS := -I$(SHOME) -O2 -Ddebian -DUDEB=0 +DEB_CFLAGS := -I$(SHOME) -O2 -Ddebian -DUDEB=0 -fno-strict-aliasing LOADLIBES := -lpopt -lresolv VPATH := $(SHOME) 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 Developers +XSBC-Original-Maintainer: Debian QA Group Standards-Version: 3.8.0 Build-Depends: libpopt-dev, debhelper (>= 5)