NetBSD Problem Report #42666
From www@NetBSD.org Sat Jan 23 12:15:52 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by www.NetBSD.org (Postfix) with ESMTP id C36ED63C556
for <gnats-bugs@gnats.NetBSD.org>; Sat, 23 Jan 2010 12:15:52 +0000 (UTC)
Message-Id: <20100123121552.8E63563C54F@www.NetBSD.org>
Date: Sat, 23 Jan 2010 12:15:52 +0000 (UTC)
From: rumcic@gmail.com
Reply-To: rumcic@gmail.com
To: gnats-bugs@NetBSD.org
Subject: [PATCH] shells/bash (4.1) does not compile on DragonFly BSD
X-Send-Pr-Version: www-1.0
>Number: 42666
>Category: pkg
>Synopsis: [PATCH] shells/bash (4.1) does not compile on DragonFly BSD
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: dfly-pkg-people
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat Jan 23 12:20:00 +0000 2010
>Closed-Date: Tue Feb 09 12:32:08 +0000 2010
>Last-Modified: Tue Feb 09 12:35:03 +0000 2010
>Originator: Rumko
>Release: /
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.5.1-DEVELOPMENT DragonFly v2.5.1.612.gdb42c-DEVELOPMENT #68: Mon Jan 18 13:19:58 CET 2010 root@rumko.rumko.net:/usr/obj/usr/src/sys/MYPRECIOUS i386
>Description:
Bash tries to access private fields of FILE, which is a no-no on DragonFly.
The previous version (4.0.x) did not try to do this, but current (4.1) version adds DragonFly "compatibility" in WRKSRC/lib/sh/fpurge line 56 (if __sferror is changed to if __sferror || _DragonFly_).
>How-To-Repeat:
>Fix:
From a58d7862862d2f60abeaa8c238993f7b15accbca Mon Sep 17 00:00:00 2001
From: Rumko <rumcic@gmail.com>
Date: Sat, 23 Jan 2010 12:53:57 +0100
Subject: [PATCH 7/7] Bash tries to access private fields of FILE which is a no-no.
---
shells/bash/distinfo | 1 +
shells/bash/patches/patch-aa | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 shells/bash/patches/patch-aa
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 421795a..1051bd5 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -3,5 +3,6 @@ $NetBSD: distinfo,v 1.19 2010/01/16 17:17:04 wiz Exp $
SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207
Size (bash-4.1.tar.gz) = 6598300 bytes
+SHA1 (patch-aa) = c85a6c782c3133a42b0ca7064662b017b179dce7
SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa
new file mode 100644
index 0000000..1ee74ab
--- /dev/null
+++ b/shells/bash/patches/patch-aa
@@ -0,0 +1,20 @@
+--- lib/sh/fpurge.c.orig 2010-01-23 12:47:36 +0100
++++ lib/sh/fpurge.c 2010-01-23 12:48:07 +0100
+@@ -53,7 +53,7 @@
+ extern int fpurge (FILE *);
+ # endif
+ int result = fpurge (fp);
+-# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
++# if defined __sferror /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+ if (result == 0)
+ /* Correct the invariants that fpurge broke.
+ <stdio.h> on BSD systems says:
+@@ -81,7 +81,7 @@
+ fp->_IO_save_base = NULL;
+ }
+ return 0;
+-# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
++# elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+ fp_->_p = fp_->_bf._base;
+ fp_->_r = 0;
+ fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */
--
1.6.6
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->wiz
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Wed, 03 Feb 2010 08:01:22 +0000
Responsible-Changed-Why:
Over to maintainer.
Responsible-Changed-From-To: wiz->dfly-pkg-people
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Wed, 03 Feb 2010 08:40:29 +0000
Responsible-Changed-Why:
Dragonfly specific PR.
From: Steve O'Hara-Smith <steve@sohara.org>
To: gnats-bugs@NetBSD.org
Cc: wiz@NetBSD.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/42666 ([PATCH] shells/bash (4.1) does not compile on
DragonFly BSD)
Date: Tue, 9 Feb 2010 09:26:58 +0000
This is a multi-part message in MIME format.
--Multipart=_Tue__9_Feb_2010_09_26_58_+0000_aCTRfZSIoc5U2ZtI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Hi,
Following discussion on dragonfly-users mailing list the attached
patch retains the functionality by using a DragonFly specific cast.
On Wed, 3 Feb 2010 08:40:31 +0000 (UTC)
wiz@NetBSD.org wrote:
> Synopsis: [PATCH] shells/bash (4.1) does not compile on DragonFly BSD
>
> Responsible-Changed-From-To: wiz->dfly-pkg-people
> Responsible-Changed-By: wiz@NetBSD.org
> Responsible-Changed-When: Wed, 03 Feb 2010 08:40:29 +0000
> Responsible-Changed-Why:
> Dragonfly specific PR.
>
>
>
>
--
Steve O'Hara-Smith | Directable Mirror Arrays
C:>WIN | A better way to focus the sun
The computer obeys and wins. | licences available see
You lose and Bill collects. | http://www.sohara.org/
--Multipart=_Tue__9_Feb_2010_09_26_58_+0000_aCTRfZSIoc5U2ZtI
Content-Type: application/octet-stream;
name="fpurge.patch"
Content-Disposition: attachment;
filename="fpurge.patch"
Content-Transfer-Encoding: base64
JE5ldEJTRCQKCi0tLSBsaWIvc2gvZnB1cmdlLmMub3JpZwkyMDEwLTAyLTA4IDE3OjMxOjE4ICsw
MDAwCisrKyBsaWIvc2gvZnB1cmdlLmMKQEAgLTUzLDcgKzUzLDcgQEAgZnB1cmdlIChGSUxFICpm
cCkKICAgZXh0ZXJuIGludCBmcHVyZ2UgKEZJTEUgKik7CiAjIGVuZGlmCiAgIGludCByZXN1bHQg
PSBmcHVyZ2UgKGZwKTsKLSMgaWYgZGVmaW5lZCBfX3NmZXJyb3IgfHwgZGVmaW5lZCBfX0RyYWdv
bkZseV9fIC8qIEZyZWVCU0QsIE5ldEJTRCwgT3BlbkJTRCwgRHJhZ29uRmx5LCBNYWNPUyBYLCBD
eWd3aW4gKi8KKyMgaWYgZGVmaW5lZCBfX3NmZXJyb3IgLyogRnJlZUJTRCwgTmV0QlNELCBPcGVu
QlNELCBEcmFnb25GbHksIE1hY09TIFgsIEN5Z3dpbiAqLwogICBpZiAocmVzdWx0ID09IDApCiAg
ICAgLyogQ29ycmVjdCB0aGUgaW52YXJpYW50cyB0aGF0IGZwdXJnZSBicm9rZS4KICAgICAgICA8
c3RkaW8uaD4gb24gQlNEIHN5c3RlbXMgc2F5czoKQEAgLTYzLDYgKzYzLDkgQEAgZnB1cmdlIChG
SUxFICpmcCkKICAgICAgICBpbnRvIHRoZSBidWZmZXIsIGFsdGhvdWdoIHRoZXkgc2hvdWxkbid0
IGJlIGFsbG93ZWQgdG8uICAqLwogICAgIGlmICgoZnAtPl9mbGFncyAmIF9fU1JEKSAhPSAwKQog
ICAgICAgZnAtPl93ID0gMDsKKyNlbGlmIGRlZmluZWQgX19EcmFnb25GbHlfXworICAgIGlmICgo
KChzdHJ1Y3QgX19GSUxFX3B1YmxpYyAqKSBmcCktPl9mbGFncyAmIF9fU1JEKSAhPSAwKQorICAg
ICAgKChzdHJ1Y3QgX19GSUxFX3B1YmxpYyAqKSBmcCktPl93ID0gMDsKICMgZW5kaWYKICAgcmV0
dXJuIHJlc3VsdDsKIApAQCAtODEsNyArODQsNyBAQCBmcHVyZ2UgKEZJTEUgKmZwKQogICAgICAg
ZnAtPl9JT19zYXZlX2Jhc2UgPSBOVUxMOwogICAgIH0KICAgcmV0dXJuIDA7Ci0jIGVsaWYgZGVm
aW5lZCBfX3NmZXJyb3IgfHwgZGVmaW5lZCBfX0RyYWdvbkZseV9fIC8qIEZyZWVCU0QsIE5ldEJT
RCwgT3BlbkJTRCwgRHJhZ29uRmx5LCBNYWNPUyBYLCBDeWd3aW4gKi8KKyMgZWxpZiBkZWZpbmVk
IF9fc2ZlcnJvciAvKiBGcmVlQlNELCBOZXRCU0QsIE9wZW5CU0QsIE1hY09TIFgsIEN5Z3dpbiAq
LwogICBmcF8tPl9wID0gZnBfLT5fYmYuX2Jhc2U7CiAgIGZwXy0+X3IgPSAwOwogICBmcF8tPl93
ID0gKChmcF8tPl9mbGFncyAmIChfX1NMQkYgfCBfX1NOQkYgfCBfX1NSRCkpID09IDAgLyogZnVs
bHkgYnVmZmVyZWQgYW5kIG5vdCBjdXJyZW50bHkgcmVhZGluZz8gKi8K
--Multipart=_Tue__9_Feb_2010_09_26_58_+0000_aCTRfZSIoc5U2ZtI--
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Tue, 09 Feb 2010 12:32:08 +0000
State-Changed-Why:
Patch committed, thanks.
From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/42666 CVS commit: pkgsrc/shells/bash
Date: Tue, 9 Feb 2010 12:31:20 +0000
Module Name: pkgsrc
Committed By: wiz
Date: Tue Feb 9 12:31:20 UTC 2010
Modified Files:
pkgsrc/shells/bash: distinfo
Added Files:
pkgsrc/shells/bash/patches: patch-aa
Log Message:
Add patch fixing build on DragonFly provided by Steve O'Hara-Smith
in PR 42666.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/shells/bash/patches/patch-aa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: Thomas Klausner <wiz@NetBSD.org>
To: Steve O'Hara-Smith <steve@sohara.org>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/42666 ([PATCH] shells/bash (4.1) does not compile on
DragonFly BSD)
Date: Tue, 9 Feb 2010 13:31:49 +0100
On Tue, Feb 09, 2010 at 09:26:58AM +0000, Steve O'Hara-Smith wrote:
> Following discussion on dragonfly-users mailing list the attached
> patch retains the functionality by using a DragonFly specific cast.
Thanks. I've committed the patch.
Please make sure it's sent upstream!
Thomas
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.