Package: cutter Severity: normal Tags: patch The attached diff fixes the passing of CFLAGS from debian/rules to the main Makefile. Without this fix, the CFLAGS set in debian/rules (-Wall -g -O2) are not communicated down.
It also fixes an error in the manpage cutter(8), which produced an error message in the `man` output. Futher it updates the FSF address in debian/copyright. It also cleans up the code a bit, fixing several compiler warnings. 3 correlated ones remain, though they are harmless, and the fix looks rather stupid to me. Lastly it updates Standards-Version to 3.7.2, no changes are required AFAICS. With this patch cutter is lintian and linda clean again. HTH, Christian Aichinger -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (990, 'testing'), (500, 'testing-proposed-updates'), (500, 'proposed-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.12-rc6-vs2.1.0-pre1-r20050817 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=UTF-8)
diff -Nur cutter-1.02.old/cutter.8 cutter-1.02/cutter.8 --- cutter-1.02.old/cutter.8 2006-06-09 06:20:02.000000000 +0200 +++ cutter-1.02/cutter.8 2006-06-09 07:11:25.000000000 +0200 @@ -5,7 +5,7 @@ .SH SYNOPSIS .B cutter .IR ipaddress1 \ [ \ port1 \ [ \ ipaddress2 \ [ \ port2 -.R ] \ ] \ ] +\ ] \ ] \ ] .br .SH DESCRIPTION .B Cutter diff -Nur cutter-1.02.old/cutter.c cutter-1.02/cutter.c --- cutter-1.02.old/cutter.c 2003-06-16 21:35:02.000000000 +0200 +++ cutter-1.02/cutter.c 2006-06-09 06:42:29.000000000 +0200 @@ -57,6 +57,7 @@ #include <arpa/inet.h> #include <net/if.h> #include <errno.h> +#include <time.h> #define ETHHDR sizeof(struct ethhdr) #define TCPHDR sizeof(struct tcphdr) @@ -149,7 +150,6 @@ int getmac(in_addr_t ip, uchar *mac) { FILE *id = fopen( "/proc/net/arp", "r" ); - union { uchar c[4]; in_addr_t n; } ipu; in_addr_t ipn; int mac0, mac1, mac2, mac3, mac4, mac5; int hwtype, flags; @@ -240,7 +240,7 @@ u_short toport ) { - int i_result, raw_sock, rtn; + int i_result, raw_sock; in_addr_t gateway_ip; struct sockaddr_ll myaddr, hisaddr; struct tpack tpack; @@ -377,7 +377,7 @@ for ( ; time(0) < tstart + 15; ) { // give the peer 15 seconds to respond struct sockaddr_ll gotaddr; - int addrlen = sizeof(gotaddr); + unsigned int addrlen = sizeof(gotaddr); fd_set readfds; struct timeval tv; diff -Nur cutter-1.02.old/debian/control cutter-1.02/debian/control --- cutter-1.02.old/debian/control 2006-06-09 06:20:02.000000000 +0200 +++ cutter-1.02/debian/control 2006-06-09 07:14:44.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Blars Blarson <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.1 +Standards-Version: 3.7.2 Package: cutter Architecture: any diff -Nur cutter-1.02.old/debian/copyright cutter-1.02/debian/copyright --- cutter-1.02.old/debian/copyright 2006-06-09 06:20:02.000000000 +0200 +++ cutter-1.02/debian/copyright 2006-06-09 07:16:50.000000000 +0200 @@ -19,9 +19,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff -Nur cutter-1.02.old/debian/rules cutter-1.02/debian/rules --- cutter-1.02.old/debian/rules 2006-06-09 06:20:02.000000000 +0200 +++ cutter-1.02/debian/rules 2006-06-09 06:34:53.000000000 +0200 @@ -33,7 +33,7 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) + $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp
signature.asc
Description: Digital signature