diff options
| author | skrll <skrll@pkgsrc.org> | 2001-11-28 13:34:18 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2001-11-28 13:34:18 +0000 |
| commit | 7871eea1efb8de2eac43b8ea49051ba6549133fc (patch) | |
| tree | 89885652e7fce2fea2fbab75044caa967605c988 | |
| parent | 3b06c569559a168a89c72e4576e112a90390ae94 (diff) | |
| download | pkgsrc-7871eea1efb8de2eac43b8ea49051ba6549133fc.tar.gz | |
Apply fix from Mark Davies in pkg/14755: kcontrol's info/partitions page
seg faults with nfs partitions
| -rw-r--r-- | x11/kdebase2/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdebase2/patches/patch-an | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index b109fc51725..7b1baa178bb 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2001/11/13 21:10:46 jlam Exp $ +$NetBSD: distinfo,v 1.14 2001/11/28 13:34:18 skrll Exp $ SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9 Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes @@ -19,7 +19,7 @@ SHA1 (patch-aj) = 9b9c94d0b70c6eb1166144ef0da6fa51405fd698 SHA1 (patch-ak) = b84ba03330ba49d8410237f3551a8331aa51c8e8 SHA1 (patch-al) = 0540bc48551547b2d749c5a3abce3f0511c04522 SHA1 (patch-am) = c4031c4ae4e3059615e744c634857af7c8e9ceef -SHA1 (patch-an) = 143cfcc7c484a9b8e2ecfe8b20e1530c0126bd44 +SHA1 (patch-an) = 5a87690d7b2ed6aa12bb6f06b452c8edac62ff0c SHA1 (patch-ao) = bfaa153d9e7429955def1b549647e5a56befb862 SHA1 (patch-ap) = 9b2c20a744ac6b0e1166f26d77fa1beacf12f5b2 SHA1 (patch-aq) = 41bc29852561d5dbc2b5d874f63e0f14ecde9677 diff --git a/x11/kdebase2/patches/patch-an b/x11/kdebase2/patches/patch-an index 4c1ae5b41ab..5883122b802 100644 --- a/x11/kdebase2/patches/patch-an +++ b/x11/kdebase2/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.2 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-an,v 1.3 2001/11/28 13:34:19 skrll Exp $ --- kcontrol/info/info_netbsd.cpp.orig Fri Sep 7 20:23:47 2001 +++ kcontrol/info/info_netbsd.cpp @@ -206,7 +206,7 @@ $NetBSD: patch-an,v 1.2 2001/10/15 22:46:00 skrll Exp $ device = strsep(&line, " "); -@@ -286,10 +303,28 @@ +@@ -286,10 +303,32 @@ (void) strsep(&line, " "); // consume word "type" type = strsep(&line, " "); @@ -215,8 +215,12 @@ $NetBSD: patch-an,v 1.2 2001/10/15 22:46:00 skrll Exp $ - olditem = new QListViewItem(lbox, olditem, device, mountpoint, - type, flags); + // Skip leading '(' and trailing ')' -+ line++; -+ flags = strsep(&line, ")"); ++ if (line != NULL) { ++ line++; ++ flags = strsep(&line, ")"); ++ } else { ++ flags = ""; ++ } + + if (statfs(mountpoint, &sfs) == 0) { + tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513) |