diff options
| author | wiz <wiz> | 2002-08-20 13:03:41 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-08-20 13:03:41 +0000 |
| commit | 99342133b364a2dd7118561d97ce86178959f053 (patch) | |
| tree | bfc36de873a4fd00a08841983d66580e72d7bda7 | |
| parent | f63fa403244315a1f32d3450d2ced5e9293ecfc4 (diff) | |
| download | pkgsrc-99342133b364a2dd7118561d97ce86178959f053.tar.gz | |
Pull up
1.4 Makefile
1.4 distinfo
1.2 patches/patch-df
to the 1.6 branch, as requested by skrll:
Plug the memory leak introduced into ksysguardd. Fixes pkg/17962 from
hclsmith at yahoo dot ca.
One day I might even get round to finishing NetBSD support for ksysguardd.
PKGREVISION++
| -rw-r--r-- | x11/kdebase3/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-df | 12 |
3 files changed, 11 insertions, 8 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index a3c69fc2039..6ddf484fa0d 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/07/17 07:54:06 skrll Exp $ +# $NetBSD: Makefile,v 1.3.6.1 2002/08/20 13:03:41 wiz Exp $ DISTNAME= kdebase-3.0.2 +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 90dffa3c732..97ff479ab8e 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/17 07:54:07 skrll Exp $ +$NetBSD: distinfo,v 1.3.6.1 2002/08/20 13:03:41 wiz Exp $ SHA1 (kdebase-3.0.2.tar.bz2) = 763af0ddce718789fae3dfe2b67036dbc2d01a02 Size (kdebase-3.0.2.tar.bz2) = 13115043 bytes @@ -89,7 +89,7 @@ SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d SHA1 (patch-dd) = 16248be0933c5d48c276d397e57eee959d2143b2 SHA1 (patch-de) = 1fbea1abe5a8aefc0eacdc94d4ff60d26fb3c02a -SHA1 (patch-df) = 3de0ddccca24e280ba3762eb802046f419c6c341 +SHA1 (patch-df) = 8c2ac2dda76839be08c4ed8667cd50b7a3cd4c2b SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d SHA1 (patch-dh) = b84568ed97b14b16bbfdbc73dcb91b920242ad1b SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59 diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df index 963355fe143..c1acd541fb1 100644 --- a/x11/kdebase3/patches/patch-df +++ b/x11/kdebase3/patches/patch-df @@ -1,4 +1,4 @@ -$NetBSD: patch-df,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ +$NetBSD: patch-df,v 1.1.1.1.4.1 2002/08/20 13:03:41 wiz Exp $ --- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Tue Sep 18 15:03:53 2001 +++ ksysguard/ksysguardd/FreeBSD/netdev.c @@ -20,7 +20,7 @@ $NetBSD: patch-df,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ +#endif -@@ -84,4 +92,16 @@ +@@ -84,4 +92,17 @@ int numActivIfaces(void) { int counter = 0; + @@ -34,16 +34,17 @@ $NetBSD: patch-df,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + if (ifa->ifa_flags & IFF_UP) + counter++; + } ++ freeifaddrs(ifap); +#else int name[6]; int num_iface, i; -@@ -105,4 +125,5 @@ +@@ -105,4 +126,5 @@ int numActivIfaces(void) counter++; } +#endif return counter; -@@ -175,4 +196,15 @@ +@@ -175,4 +197,16 @@ void exitNetDev(void) void updateNetDev(void) { +#if defined(__NetBSD__) @@ -56,10 +57,11 @@ $NetBSD: patch-df,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + if (ifa->ifa_flags & IFF_UP) + ; + } ++ freeifaddrs(ifap); +#else int name[6]; int num_iface, i; -@@ -209,4 +241,5 @@ +@@ -209,4 +243,5 @@ void updateNetDev(void) } } +#endif |