diff -Nru ifhp-3.5.20/debian/changelog ifhp-3.5.20/debian/changelog --- ifhp-3.5.20/debian/changelog 2010-05-17 09:38:39.000000000 +0530 +++ ifhp-3.5.20/debian/changelog 2010-08-01 13:00:38.000000000 +0530 @@ -1,3 +1,17 @@ +ifhp (3.5.20-12.1ubuntu1) maverick; urgency=low + + * Merge from debian unstable(LP: #612209). Remaining changes: + o Split out ubuntu changes to patches due to new quilt + format:- + - 60-fix_memset_arguments.patch: + + Fix transposed arguments to memset, which caused a build + failure. + - 61-replace_plain_write.patch: + + Use Write_fd_str/Write_fd_len rather than plain write when + writing the status file. + + -- Bhavani Shankar Sun, 01 Aug 2010 12:54:58 +0530 + ifhp (3.5.20-12.1) unstable; urgency=low [Jari Aalto] @@ -32,6 +46,14 @@ -- Jari Aalto Mon, 17 May 2010 07:08:39 +0300 +ifhp (3.5.20-12ubuntu1) lucid; urgency=low + + * Fix transposed arguments to memset, which caused a build failure. + * Use Write_fd_str/Write_fd_len rather than plain write when writing the + status file. + + -- Colin Watson Wed, 14 Apr 2010 15:49:19 +0100 + ifhp (3.5.20-12) unstable; urgency=low * debian/changelog (3.5.20-11): Wrap over-long line. @@ -287,3 +309,4 @@ * Initial release. -- Torsten Landschoff Tue, 16 Nov 1999 13:04:27 +0100 + diff -Nru ifhp-3.5.20/debian/control ifhp-3.5.20/debian/control --- ifhp-3.5.20/debian/control 2010-05-08 17:02:43.000000000 +0530 +++ ifhp-3.5.20/debian/control 2010-05-31 21:12:12.000000000 +0530 @@ -1,5 +1,6 @@ Source: ifhp -Maintainer: Thomas Bushnell, BSG +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Thomas Bushnell, BSG Section: net Priority: extra Standards-Version: 3.8.4 diff -Nru ifhp-3.5.20/debian/patches/60-fix_memset_arguments.patch ifhp-3.5.20/debian/patches/60-fix_memset_arguments.patch --- ifhp-3.5.20/debian/patches/60-fix_memset_arguments.patch 1970-01-01 05:30:00.000000000 +0530 +++ ifhp-3.5.20/debian/patches/60-fix_memset_arguments.patch 2010-08-01 12:47:39.000000000 +0530 @@ -0,0 +1,15 @@ +Author: Colin Watson +Description: Patch to fix transposed arguments to memset, which caused a build failure. + +--- ifhp-3.5.20.orig/src/ifhp.c ++++ ifhp-3.5.20/src/ifhp.c +@@ -672,7 +672,7 @@ void getargs( int argc, char **argv ) + } + DEBUG1("getargs: finished options"); + /* set the Topts and Zopts values */ +- memset(m,sizeof(m),0); ++ memset(m,0,sizeof(m)); + m[0] = m[1] = 0; + for( i = 'a'; i <= 'z'; ++i ){ + m[0] = i; + diff -Nru ifhp-3.5.20/debian/patches/61-replace_plain_write.patch ifhp-3.5.20/debian/patches/61-replace_plain_write.patch --- ifhp-3.5.20/debian/patches/61-replace_plain_write.patch 1970-01-01 05:30:00.000000000 +0530 +++ ifhp-3.5.20/debian/patches/61-replace_plain_write.patch 2010-08-01 12:52:22.000000000 +0530 @@ -0,0 +1,19 @@ +Author: Colin Watson +Description: Parch to use Write_fd_str/Write_fd_len rather than plain write when writing the status file. + +--- ifhp-3.5.20.orig/src/errormsg.c ++++ ifhp-3.5.20/src/errormsg.c +@@ -539,11 +539,11 @@ void setstatus( char *msg, char *details + buffer[n] = 0; + if( (s = strchr(buffer,'\n')) ){ + *s++ = 0; +- write(temp_fd, s,strlen(s)); ++ Write_fd_str(temp_fd, s); + } + } + while( (n = read(Status_fd, buffer,sizeof(buffer)-1)) > 0 ){ +- write(temp_fd, buffer,n); ++ Write_fd_len(temp_fd, buffer,n); + } + close( Status_fd ); + close( temp_fd ); diff -Nru ifhp-3.5.20/debian/patches/series ifhp-3.5.20/debian/patches/series --- ifhp-3.5.20/debian/patches/series 2010-05-17 09:38:57.000000000 +0530 +++ ifhp-3.5.20/debian/patches/series 2010-08-01 13:01:09.000000000 +0530 @@ -4,3 +4,5 @@ 50-configure.in.patch 51-libtoolize-2.2.6b--ltmain.sh.patch debian-changes-3.5.20-12.1 +60-fix_memset_arguments.patch +61-replace_plain_write.patch