Sun Mar 3 10:41:28 2019 UTC ()
emulators/gxemul: Fix console data loss

Set the SA_RESTART flag on SIGALRM so that it will not interrupt
writes to the console causing loss of console data.  Bump PKGREVISION.


(gson)
diff -r1.62 -r1.63 pkgsrc/emulators/gxemul/Makefile
diff -r1.55 -r1.56 pkgsrc/emulators/gxemul/distinfo
diff -r0 -r1.1 pkgsrc/emulators/gxemul/patches/patch-src_old__main_timer.cc
cvs diff -r1.62 -r1.63 pkgsrc/emulators/gxemul/Makefile (switch to unified diff)

--- pkgsrc/emulators/gxemul/Makefile 2019/01/04 13:35:16 1.62
+++ pkgsrc/emulators/gxemul/Makefile 2019/03/03 10:41:28 1.63
@@ -1,48 +1,49 @@ @@ -1,48 +1,49 @@
1# $NetBSD: Makefile,v 1.62 2019/01/04 13:35:16 ryoon Exp $ 1# $NetBSD: Makefile,v 1.63 2019/03/03 10:41:28 gson Exp $
2 2
3DISTNAME= gxemul-0.6.1 3DISTNAME= gxemul-0.6.1
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gxemul/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gxemul/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://gavare.se/gxemul/ 9HOMEPAGE= http://gavare.se/gxemul/
9COMMENT= Framework for full-system computer architecture emulation 10COMMENT= Framework for full-system computer architecture emulation
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12USE_TOOLS+= pax 13USE_TOOLS+= pax
13 14
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
16BUILD_TARGET= build 17BUILD_TARGET= build
17 18
18LDFLAGS.SunOS+= -lsocket -lnsl 19LDFLAGS.SunOS+= -lsocket -lnsl
19 20
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/${PKGBASE} 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
21 22
22do-install: 23do-install:
23 ${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${DESTDIR}${PREFIX}/bin
24 ${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 25 ${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
25.for f in README HISTORY LICENSE 26.for f in README HISTORY LICENSE
26 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 27 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
27.endfor 28.endfor
28 cd ${WRKSRC}/doc && pax -rwppm . ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 29 cd ${WRKSRC}/doc && pax -rwppm . ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
29 30
30PKG_OPTIONS_VAR= PKG_OPTIONS.gxemul 31PKG_OPTIONS_VAR= PKG_OPTIONS.gxemul
31PKG_SUPPORTED_OPTIONS= x11 32PKG_SUPPORTED_OPTIONS= x11
32PKG_SUGGESTED_OPTIONS= x11 33PKG_SUGGESTED_OPTIONS= x11
33 34
34.include "../../mk/bsd.options.mk" 35.include "../../mk/bsd.options.mk"
35 36
36.if !empty(PKG_OPTIONS:Mx11) 37.if !empty(PKG_OPTIONS:Mx11)
37GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib 38GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
38SUBST_CLASSES+= x11 39SUBST_CLASSES+= x11
39SUBST_STAGE.x11= pre-configure 40SUBST_STAGE.x11= pre-configure
40SUBST_FILES.x11= configure 41SUBST_FILES.x11= configure
41SUBST_SED.x11= -e 's|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS:Q}|g' 42SUBST_SED.x11= -e 's|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS:Q}|g'
42SUBST_SED.x11+= -e 's|/usr/X11R6|${X11BASE}|g' 43SUBST_SED.x11+= -e 's|/usr/X11R6|${X11BASE}|g'
43SUBST_MESSAGE.x11= Fixing X linking flags. 44SUBST_MESSAGE.x11= Fixing X linking flags.
44 45
45.include "../../x11/libX11/buildlink3.mk" 46.include "../../x11/libX11/buildlink3.mk"
46.endif 47.endif
47 48
48.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.55 -r1.56 pkgsrc/emulators/gxemul/distinfo (switch to unified diff)

--- pkgsrc/emulators/gxemul/distinfo 2019/01/04 13:35:16 1.55
+++ pkgsrc/emulators/gxemul/distinfo 2019/03/03 10:41:28 1.56
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.55 2019/01/04 13:35:16 ryoon Exp $ 1$NetBSD: distinfo,v 1.56 2019/03/03 10:41:28 gson Exp $
2 2
3SHA1 (gxemul-0.6.1.tar.gz) = 150e495e91a968a49ffc7fe2390c3edff100508d 3SHA1 (gxemul-0.6.1.tar.gz) = 150e495e91a968a49ffc7fe2390c3edff100508d
4RMD160 (gxemul-0.6.1.tar.gz) = 0434bff07970d8828531d222cc8b95c64c2d62f1 4RMD160 (gxemul-0.6.1.tar.gz) = 0434bff07970d8828531d222cc8b95c64c2d62f1
5SHA512 (gxemul-0.6.1.tar.gz) = 03dbbaa9ba5e36b4644a984f06bffa5ff9e763f395c472c0fbdfc8bca975a5fb184a676d3a6c5e1a3483c3c62a2778af9c36d2bf4ab8dcaf21b3dfac8abcd301 5SHA512 (gxemul-0.6.1.tar.gz) = 03dbbaa9ba5e36b4644a984f06bffa5ff9e763f395c472c0fbdfc8bca975a5fb184a676d3a6c5e1a3483c3c62a2778af9c36d2bf4ab8dcaf21b3dfac8abcd301
6Size (gxemul-0.6.1.tar.gz) = 5617712 bytes 6Size (gxemul-0.6.1.tar.gz) = 5617712 bytes
7SHA1 (patch-ad) = 7f02cce83c58bbd5399b157a9da9c6c4260122f0 7SHA1 (patch-ad) = 7f02cce83c58bbd5399b157a9da9c6c4260122f0
8SHA1 (patch-src_components_cpu_CPUDyntransComponent.cc) = dd7a9a83d8abce053e5e61a6aa6ae057c6c51a6a 8SHA1 (patch-src_components_cpu_CPUDyntransComponent.cc) = dd7a9a83d8abce053e5e61a6aa6ae057c6c51a6a
9SHA1 (patch-src_components_cpu_M88K__CPUComponent.cc) = 4b456721aa0639b91d2dab82fb28f61a951ec8f4 9SHA1 (patch-src_components_cpu_M88K__CPUComponent.cc) = 4b456721aa0639b91d2dab82fb28f61a951ec8f4
10SHA1 (patch-src_components_cpu_MIPS__CPUComponent.cc) = 9bcb304937ccfa491e37da6f57729854294c420d 10SHA1 (patch-src_components_cpu_MIPS__CPUComponent.cc) = 9bcb304937ccfa491e37da6f57729854294c420d
11SHA1 (patch-src_console_console.cc) = 0b9c07eaa26a39b20a6f6769cdf02208fc9667d3 11SHA1 (patch-src_console_console.cc) = 0b9c07eaa26a39b20a6f6769cdf02208fc9667d3
12SHA1 (patch-src_cpus_cpu_mips.cc) = ad6d9c8b452b1b8422d9194cadfa1c8c3d29ef21 12SHA1 (patch-src_cpus_cpu_mips.cc) = ad6d9c8b452b1b8422d9194cadfa1c8c3d29ef21
13SHA1 (patch-src_devices_dev__footbridge.cc) = 2dc76e65fff7e6c846d9d06b74bed76075b0c79a 13SHA1 (patch-src_devices_dev__footbridge.cc) = 2dc76e65fff7e6c846d9d06b74bed76075b0c79a
14SHA1 (patch-src_devices_dev__sh4.cc) = 81e3dcc01934c71389a91861343bc8aa32284160 14SHA1 (patch-src_devices_dev__sh4.cc) = 81e3dcc01934c71389a91861343bc8aa32284160
15SHA1 (patch-src_include_components_CPUDyntransComponent.h) = f60d31261a03a0a73fa4844143da4931cae85ce6 15SHA1 (patch-src_include_components_CPUDyntransComponent.h) = f60d31261a03a0a73fa4844143da4931cae85ce6
16SHA1 (patch-src_include_components_M88K__CPUComponent.h) = 5232386ac337c552d88cbdb829b6f0f3e94ba0f2 16SHA1 (patch-src_include_components_M88K__CPUComponent.h) = 5232386ac337c552d88cbdb829b6f0f3e94ba0f2
17SHA1 (patch-src_include_components_MIPS__CPUComponent.h) = 48bc9ea9dacbe7afd9734ee04e270943208db148 17SHA1 (patch-src_include_components_MIPS__CPUComponent.h) = 48bc9ea9dacbe7afd9734ee04e270943208db148
18SHA1 (patch-src_include_mips_cpu_types.h) = 04fff50fad3e619e7e0eeb8bf17a79edd18b2147 18SHA1 (patch-src_include_mips_cpu_types.h) = 04fff50fad3e619e7e0eeb8bf17a79edd18b2147
19SHA1 (patch-src_include_refcount__ptr.h) = 6c8742b199801c1db906d4856f6f5f01a0f25fe0 19SHA1 (patch-src_include_refcount__ptr.h) = 6c8742b199801c1db906d4856f6f5f01a0f25fe0
20SHA1 (patch-src_machines_machine__pmax.cc) = ed3fba7eacb593cbba082a6d8d8ec823bf90162f 20SHA1 (patch-src_machines_machine__pmax.cc) = ed3fba7eacb593cbba082a6d8d8ec823bf90162f
 21SHA1 (patch-src_old__main_timer.cc) = a6234d80f28611a5be18b917a4249b8530b433bc
File Added: pkgsrc/emulators/gxemul/patches/Attic/patch-src_old__main_timer.cc
$NetBSD: patch-src_old__main_timer.cc,v 1.1 2019/03/03 10:41:28 gson Exp $

Set the SA_RESTART flag on SIGALRM so that it will not interrupt
writes to the console causing loss of console data.

--- src/old_main/timer.cc.orig	2018-12-07 06:29:22.000000000 +0000
+++ src/old_main/timer.cc
@@ -229,6 +229,7 @@ void timer_start(void)
 
 	memset(&saction, 0, sizeof(saction));
 	saction.sa_handler = timer_tick;
+	saction.sa_flags = SA_RESTART;
 
 	sigaction(SIGALRM, &saction, NULL);