- Update to 3.05 Port maintainer (bzeeb+freebsdports@zabbadoz.net) is cc'd. Generated with FreeBSD Port Tools 0.77
Responsible Changed From-To: freebsd-ports-bugs->trasz Submitter has GNATS access (via the GNATS Auto Assign Tool)
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
PreS: my original reply was w/o gnats ID because of the Cc:; no idea where it ended up:( On Tue, 8 Jan 2008, Edward Tomasz Napierala wrote: Hi, I had patches around for the update for months but when I initially tested I ran into multiple problems including crashes of hercules with 3.05 fairly easy. I was on HEAD/7 that time. If it works realiably for you I can look at my update (which most likely is not too different from yours skipping through) and we can get it in nonetheless. bz@ -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT Software is harder than hardware so better get it right the first time.
State Changed From-To: feedback->suspended Doesn't really work; (slowly) working on a solution.
Hi, after the problem was solved with the help of Roger on the hercules-390 list I have an updated patch (see below). You can also fetch it from here: http://sources.zabbadoz.net/freebsd/ports/emulators-hercules-3.05-update.diff Can you try and see if it IPLs things for you as well? If yes, compile-test prtlint ... it and commit. Bjoern -- Bjoern A. Zeeb Stop bit received. Insert coin for new game. ! ! Files added: ! files/patch-20080506-cvs-endian.diff ! ! Files removed: ! files/patch-tuntap-sin_len ! files/patch-util-dasdlist ! Index: Makefile =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile 26 Nov 2007 21:18:54 -0000 1.23 +++ Makefile 7 May 2008 20:49:03 -0000 @@ -6,8 +6,7 @@ # PORTNAME= hercules -PORTVERSION= 3.04 -PORTREVISION= 1 +PORTVERSION= 3.05 CATEGORIES= emulators MASTER_SITES= http://www.hercules-390.org/ Index: distinfo =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 13 May 2006 21:49:40 -0000 1.7 +++ distinfo 7 May 2008 20:49:03 -0000 @@ -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 Index: pkg-descr =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/pkg-descr,v retrieving revision 1.4 diff -u -p -r1.4 pkg-descr --- pkg-descr 29 Apr 2003 04:48:59 -0000 1.4 +++ pkg-descr 7 May 2008 20:49:03 -0000 @@ -7,6 +7,6 @@ Jaeger designed and implemented many of 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 Index: pkg-plist =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/pkg-plist,v retrieving revision 1.5 diff -u -p -r1.5 pkg-plist --- pkg-plist 1 Feb 2007 02:41:36 -0000 1.5 +++ pkg-plist 7 May 2008 20:49:03 -0000 @@ -38,6 +38,9 @@ lib/libherct.la lib/libherct.so lib/libhercu.la lib/libhercu.so +lib/libdecNumber.so +lib/libdecNumber.la +lib/libdecNumber.a lib/hercules/dyncrypt.a lib/hercules/dyncrypt.la lib/hercules/dyncrypt.so Index: files/patch-20080506-cvs-endian.diff =================================================================== RCS file: files/patch-20080506-cvs-endian.diff diff -N files/patch-20080506-cvs-endian.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-20080506-cvs-endian.diff 7 May 2008 20:49:03 -0000 @@ -0,0 +1,168 @@ +Index: control.c +=================================================================== +RCS file: /usr/cvs/hercules/hercules/control.c,v +retrieving revision 1.266 +retrieving revision 1.267 +diff -u -p -r1.266 -r1.267 +--- control.c 11 Apr 2008 14:28:00 -0000 1.266 ++++ control.c 6 May 2008 22:15:42 -0000 1.267 +@@ -1968,16 +1971,16 @@ U16 updated = 0; + m = n; + + /* Copy from operand beginning */ +- for (i = 0; i < m; i++) ++ for (i = 0; i < m; i++, p1++) + { +- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1++); ++ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1); + updated |= BIT((r1 + i) & 0xF); + } + + /* Copy from next page */ +- for ( ; i < n; i++) ++ for ( ; i < n; i++, p2++) + { +- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2++); ++ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2); + updated |= BIT((r1 + i) & 0xF); + } + +Index: esame.c +=================================================================== +RCS file: /usr/cvs/hercules/hercules/esame.c,v +retrieving revision 1.201 +retrieving revision 1.202 +diff -u -p -r1.201 -r1.202 +--- esame.c 11 Apr 2008 14:28:29 -0000 1.201 ++++ esame.c 6 May 2008 22:15:42 -0000 1.202 +@@ -4038,8 +4041,8 @@ U32 *p1, *p2; + { + /* Boundary not crossed */ + n >>= 2; +- for (i = 0; i < n; i++) +- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < n; i++, p1++) ++ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1); + } + else + { +@@ -4052,11 +4055,11 @@ U32 *p1, *p2; + { + /* Addresses are word aligned */ + m >>= 2; +- for (i = 0; i < m; i++) +- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < m; i++, p1++) ++ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1); + n >>= 2; +- for ( ; i < n; i++) +- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2++); ++ for ( ; i < n; i++, p2++) ++ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2); + } + else + { +@@ -6728,16 +6731,16 @@ U32 *p1, *p2 = NULL; + m = n; + + /* Load from first page */ +- for (i = 0; i < m; i++) ++ for (i = 0; i < m; i++, p1++) + { +- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++); ++ regs->AR((r1 + i) & 0xF) = fetch_fw (p1); + SET_AEA_AR(regs, (r1 + i) & 0xF); + } + + /* Load from next page */ +- for ( ; i < n; i++) ++ for ( ; i < n; i++, p2++) + { +- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++); ++ regs->AR((r1 + i) & 0xF) = fetch_fw (p2); + SET_AEA_AR(regs, (r1 + i) & 0xF); + } + +@@ -6811,8 +6814,8 @@ U32 *p1, *p2; + { + /* Boundary not crossed */ + n >>= 2; +- for (i = 0; i < n; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < n; i++, p1++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); + } + else + { +@@ -6825,11 +6828,11 @@ U32 *p1, *p2; + { + /* Addresses are word aligned */ + m >>= 2; +- for (i = 0; i < m; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < m; i++, p1++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); + n >>= 2; +- for ( ; i < n; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++); ++ for ( ; i < n; i++, p2++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2); + } + else + { +Index: general1.c +=================================================================== +RCS file: /usr/cvs/hercules/hercules/general1.c,v +retrieving revision 1.165 +retrieving revision 1.166 +diff -u -p -r1.165 -r1.166 +--- general1.c 11 Apr 2008 14:28:44 -0000 1.165 ++++ general1.c 6 May 2008 22:15:42 -0000 1.166 +@@ -3413,16 +3416,16 @@ U32 *p1, *p2 = NULL; + m = n; + + /* Copy from operand beginning */ +- for (i = 0; i < m; i++) ++ for (i = 0; i < m; i++, p1++) + { +- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++); ++ regs->AR((r1 + i) & 0xF) = fetch_fw (p1); + SET_AEA_AR (regs, (r1 + i) & 0xF); + } + + /* Copy from next page */ +- for ( ; i < n; i++) ++ for ( ; i < n; i++, p2++) + { +- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++); ++ regs->AR((r1 + i) & 0xF) = fetch_fw (p2); + SET_AEA_AR (regs, (r1 + i) & 0xF); + } + +@@ -3580,8 +3583,8 @@ U32 *p1, *p2; + { + /* Boundary not crossed */ + n >>= 2; +- for (i = 0; i < n; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < n; i++, p1++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); + } + else + { +@@ -3594,11 +3597,11 @@ U32 *p1, *p2; + { + /* Addresses are word aligned */ + m >>= 2; +- for (i = 0; i < m; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); ++ for (i = 0; i < m; i++, p1++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); + n >>= 2; +- for ( ; i < n; i++) +- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++); ++ for ( ; i < n; i++, p2++) ++ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2); + } + else + { Index: files/patch-tuntap =================================================================== RCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/files/patch-tuntap,v retrieving revision 1.2 diff -u -p -r1.2 patch-tuntap --- files/patch-tuntap 13 May 2006 21:49:41 -0000 1.2 +++ files/patch-tuntap 7 May 2008 20:49:03 -0000 @@ -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( Index: files/patch-tuntap-sin_len =================================================================== RCS file: files/patch-tuntap-sin_len diff -N files/patch-tuntap-sin_len --- files/patch-tuntap-sin_len 13 May 2006 21:49:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,90 +0,0 @@ ---- ./tuntap.c.orig Sun Apr 9 12:00:35 2006 -+++ ./tuntap.c Sun Apr 9 12:01:35 2006 -@@ -230,6 +230,7 @@ int TUNTAP_SetIPAddr( char* - sin = (struct sockaddr_in*)&ifreq.ifr_addr; - - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetDevName || !*pszNetDevName ) - { -@@ -266,6 +267,7 @@ int TUNTAP_SetDestAddr( char - sin = (struct sockaddr_in*)&ifreq.ifr_addr; - - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetDevName || !*pszNetDevName ) - { -@@ -302,6 +304,7 @@ int TUNTAP_SetNetMask( char* - sin = (struct sockaddr_in*)&ifreq.ifr_netmask; - - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetDevName || !*pszNetDevName ) - { -@@ -339,6 +342,7 @@ int TUNTAP_SetMTU( char* p - sin = (struct sockaddr_in*)&ifreq.ifr_addr; - - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetDevName || !*pszNetDevName ) - { -@@ -424,6 +428,7 @@ int TUNTAP_SetFlags ( char* - sin = (struct sockaddr_in*)&ifreq.ifr_addr; - - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetDevName || !*pszNetDevName ) - { -@@ -465,6 +470,7 @@ int TUNTAP_AddRoute( char* p - - sin = (struct sockaddr_in*)&rtentry.rt_dst; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszDestAddr || - !inet_aton( pszDestAddr, &sin->sin_addr ) ) -@@ -476,6 +482,7 @@ int TUNTAP_AddRoute( char* p - - sin = (struct sockaddr_in*)&rtentry.rt_genmask; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - 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; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszDestAddr || - !inet_aton( pszDestAddr, &sin->sin_addr ) ) -@@ -541,6 +550,7 @@ int TUNTAP_DelRoute( char* p - - sin = (struct sockaddr_in*)&rtentry.rt_genmask; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszNetMask || - !inet_aton( pszNetMask, &sin->sin_addr ) ) -@@ -552,6 +562,7 @@ int TUNTAP_DelRoute( char* p - - sin = (struct sockaddr_in*)&rtentry.rt_gateway; - sin->sin_family = AF_INET; -+ sin->sin_len = sizeof( struct sockaddr_in ); - - if( !pszGWAddr || - !inet_aton( pszGWAddr, &sin->sin_addr ) ) Index: files/patch-util-dasdlist =================================================================== RCS file: files/patch-util-dasdlist diff -N files/patch-util-dasdlist --- files/patch-util-dasdlist 15 Nov 2006 20:23:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ ---- util/dasdlist.orig Tue Nov 14 10:19:08 2006 -+++ util/dasdlist Tue Nov 14 10:48:16 2006 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # This command prints a track from a CKD DASD image file. - # It uses the GNU Octal Dump (od) command to firstly obtain -@@ -22,7 +22,7 @@ fi - # - # Check the first 8 bytes of the header for valid CKD DASD image file - # --ckdid=`od -An -s --read-bytes=8 $filename` -+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
State Changed From-To: suspended->open Back to open.
trasz 2008-05-14 17:25:20 UTC FreeBSD ports repository Modified files: emulators/hercules Makefile distinfo pkg-descr pkg-plist emulators/hercules/files patch-tuntap Added files: emulators/hercules/files patch-20080506-cvs-endian.diff Removed files: emulators/hercules/files patch-tuntap-sin_len patch-util-dasdlist Log: - Update to 3.05. PR: ports/119449 Submitted by: bz@ (maintainer) Revision Changes Path 1.24 +1 -2 ports/emulators/hercules/Makefile 1.8 +3 -3 ports/emulators/hercules/distinfo 1.1 +168 -0 ports/emulators/hercules/files/patch-20080506-cvs-endian.diff (new) 1.3 +0 -23 ports/emulators/hercules/files/patch-tuntap 1.2 +0 -90 ports/emulators/hercules/files/patch-tuntap-sin_len (dead) 1.2 +0 -36 ports/emulators/hercules/files/patch-util-dasdlist (dead) 1.5 +1 -1 ports/emulators/hercules/pkg-descr 1.6 +3 -0 ports/emulators/hercules/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!