From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 8 12:40:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0209C16A46E for ; Tue, 8 Jan 2008 12:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0D4F913C4E9 for ; Tue, 8 Jan 2008 12:40:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m08Ce3Yc030430 for ; Tue, 8 Jan 2008 12:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m08Ce3uC030424; Tue, 8 Jan 2008 12:40:03 GMT (envelope-from gnats) Resent-Date: Tue, 8 Jan 2008 12:40:03 GMT Resent-Message-Id: <200801081240.m08Ce3uC030424@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edward Tomasz Napierala Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E2416A419 for ; Tue, 8 Jan 2008 12:36:06 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.freebsd.org (Postfix) with ESMTP id 87CAE13C447 for ; Tue, 8 Jan 2008 12:36:05 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id 2BA2E39B13; Tue, 8 Jan 2008 13:29:56 +0100 (CET) Message-Id: <20080108122956.2BA2E39B13@pin.if.uz.zgora.pl> Date: Tue, 8 Jan 2008 13:29:56 +0100 (CET) From: Edward Tomasz Napierala To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: bzeeb+freebsdports@zabbadoz.net Subject: ports/119449: [PATCH] emulators/hercules: update to 3.05 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 12:40:04 -0000 >Number: 119449 >Category: ports >Synopsis: [PATCH] emulators/hercules: update to 3.05 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jan 08 12:40:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Edward Tomasz Napierala >Release: FreeBSD 7.0-BETA4 i386 >Organization: >Environment: System: FreeBSD traszkan.ds7 7.0-BETA4 FreeBSD 7.0-BETA4 #1: Tue Dec 18 08:41:48 CET 2007 >Description: - Update to 3.05 Port maintainer (bzeeb+freebsdports@zabbadoz.net) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- hercules-3.05.patch begins here --- diff -ruN --exclude=CVS /usr/ports/emulators/hercules/Makefile /site1/trasz/hercules/Makefile --- /usr/ports/emulators/hercules/Makefile 2007-11-26 22:18:54.000000000 +0100 +++ /site1/trasz/hercules/Makefile 2008-01-08 12:24:47.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= hercules -PORTVERSION= 3.04 -PORTREVISION= 1 +PORTVERSION= 3.05 CATEGORIES= emulators MASTER_SITES= http://www.hercules-390.org/ diff -ruN --exclude=CVS /usr/ports/emulators/hercules/distinfo /site1/trasz/hercules/distinfo --- /usr/ports/emulators/hercules/distinfo 2006-05-13 23:49:40.000000000 +0200 +++ /site1/trasz/hercules/distinfo 2008-01-08 12:25:48.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (hercules-3.04.tar.gz) = 7c7df7d52bf0365d5cbe051dc9e2e481 -SHA256 (hercules-3.04.tar.gz) = 4512a7c2b86b4a92c337c99761295aa4eaa54e90da3d0881c283b69c03b1eed5 -SIZE (hercules-3.04.tar.gz) = 2079774 +MD5 (hercules-3.05.tar.gz) = da8d85ac18c140b460574a0454abb936 +SHA256 (hercules-3.05.tar.gz) = f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2 +SIZE (hercules-3.05.tar.gz) = 2470621 diff -ruN --exclude=CVS /usr/ports/emulators/hercules/files/patch-tuntap /site1/trasz/hercules/files/patch-tuntap --- /usr/ports/emulators/hercules/files/patch-tuntap 2006-05-13 23:49:41.000000000 +0200 +++ /site1/trasz/hercules/files/patch-tuntap 2008-01-08 12:28:50.000000000 +0100 @@ -1,26 +1,3 @@ ---- ctc_ctci.c.orig Wed Dec 14 17:17:22 2005 -+++ ctc_ctci.c Wed Jan 25 20:05:14 2006 -@@ -1114,7 +1114,7 @@ static int ParseArgs( DEVBLK* pDEVBLK, - #if defined( WIN32 ) - strcpy( pCTCBLK->szTUNCharName, tt32_get_default_iface() ); - #else -- strcpy( pCTCBLK->szTUNCharName, "/dev/net/tun" ); -+ strcpy( pCTCBLK->szTUNCharName, HERCTUN_DEV ); - #endif - - #if defined( WIN32 ) ---- ctc_lcs.c.orig Thu Dec 29 19:47:06 2005 -+++ ctc_lcs.c Wed Jan 25 20:05:14 2006 -@@ -1024,7 +1024,9 @@ static void LCS_Shutdown( PLCSDEV pLCSD - static void LCS_StartLan( PLCSDEV pLCSDEV, PLCSHDR pHeader ) - { - PLCSPORT pPort; -+#ifdef OPTION_TUNTAP_DELADD_ROUTES - PLCSRTE pRoute; -+#endif - PLCSSTDFRM pReply; - - pPort = &pLCSDEV->pLCSBLK->Port[pLCSDEV->bPort]; --- tuntap.c.orig Sun Dec 11 16:44:16 2005 +++ tuntap.c Wed Jan 25 20:05:14 2006 @@ -159,6 +159,25 @@ int TUNTAP_CreateInterface( diff -ruN --exclude=CVS /usr/ports/emulators/hercules/files/patch-tuntap-sin_len /site1/trasz/hercules/files/patch-tuntap-sin_len --- /usr/ports/emulators/hercules/files/patch-tuntap-sin_len 2006-05-13 23:49:41.000000000 +0200 +++ /site1/trasz/hercules/files/patch-tuntap-sin_len 2008-01-08 12:32:18.000000000 +0100 @@ -56,14 +56,6 @@ if( !pszNetMask || !inet_aton( pszNetMask, &sin->sin_addr ) ) -@@ -489,6 +496,7 @@ int TUNTAP_AddRoute( char* p - { - sin = (struct sockaddr_in*)&rtentry.rt_gateway; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !inet_aton( pszGWAddr, &sin->sin_addr ) ) - { @@ -530,6 +538,7 @@ int TUNTAP_DelRoute( char* p sin = (struct sockaddr_in*)&rtentry.rt_dst; diff -ruN --exclude=CVS /usr/ports/emulators/hercules/files/patch-util-dasdlist /site1/trasz/hercules/files/patch-util-dasdlist --- /usr/ports/emulators/hercules/files/patch-util-dasdlist 2006-11-15 21:23:48.000000000 +0100 +++ /site1/trasz/hercules/files/patch-util-dasdlist 2008-01-08 12:35:20.000000000 +0100 @@ -10,27 +10,8 @@ # # Check the first 8 bytes of the header for valid CKD DASD image file # --ckdid=`od -An -s --read-bytes=8 $filename` +-ckdid=`head -n 1 $filename | cut -c1-8` +ckdid=`hexdump -n 8 -e '"%_p"' $filename` if [ $ckdid != "CKD_P370" ]; then echo "File $filename is not a CKD DASD image file" exit 2 -@@ -31,8 +31,8 @@ fi - # - # The next 8 bytes contain the tracks/cyl and track length constants - # --heads=`od -An -tu4 --skip-bytes=8 --read-bytes=4 $filename` --trklen=`od -An -tu4 --skip-bytes=12 --read-bytes=4 $filename` -+heads=`od -An -tu4 -j 8 -N 4 $filename` -+trklen=`od -An -tu4 -j 12 -N 4 $filename` - - echo "$filename $(($heads)) trks/cyl, $(($trklen)) bytes/trk" - -@@ -54,5 +54,5 @@ num=$(($trklen)) - # Dump the requested track - # - echo "$filename Cyl $(($cyl)) Head $(($head))" --echo "od -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename" --od -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename -+echo "od -Ax -tx1 -j $offset -N $num $filename" -+od -Ax -tx1 -j $offset -N $num $filename diff -ruN --exclude=CVS /usr/ports/emulators/hercules/pkg-descr /site1/trasz/hercules/pkg-descr --- /usr/ports/emulators/hercules/pkg-descr 2003-04-29 06:48:59.000000000 +0200 +++ /site1/trasz/hercules/pkg-descr 2008-01-08 12:26:18.000000000 +0100 @@ -7,6 +7,6 @@ including dynamic reconfiguration, integrated console, interpretive execution and z/Architecture support. -WWW: http://www.conmicro.cx/hercules/ +WWW: http://www.hercules-390.org -phk@FreeBSD.org --- hercules-3.05.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: