From 236eddb324999f278546cda749e776c33e1e9b34 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 11 Apr 2010 12:38:56 +0000 Subject: [PATCH] Actually compile the procaffinity stub. Fix a double free, found out while working on an upcoming gnome-system-monitor port. --- devel/libgtop2/Makefile | 4 +- .../patches/patch-sysdeps_bsd_Makefile_in | 42 +++++++++---------- .../patches/patch-sysdeps_bsd_sysinfo_c | 22 +++++++--- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index d95563e555f..195c2c82427 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2010/04/08 15:57:46 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.39 2010/04/11 12:38:56 ajacoutot Exp $ COMMENT= portable library for obtaining system information GNOME_VERSION= 2.28.1 GNOME_PROJECT= libgtop -PKGNAME= libgtop2-${VERSION}p0 +PKGNAME= libgtop2-${VERSION}p1 SHARED_LIBS= gtop-2.0 9.0 # .9.0 diff --git a/devel/libgtop2/patches/patch-sysdeps_bsd_Makefile_in b/devel/libgtop2/patches/patch-sysdeps_bsd_Makefile_in index 5eca2db0549..b7524f70aaf 100644 --- a/devel/libgtop2/patches/patch-sysdeps_bsd_Makefile_in +++ b/devel/libgtop2/patches/patch-sysdeps_bsd_Makefile_in @@ -1,25 +1,25 @@ -$OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.2 2010/03/30 16:24:24 ajacoutot Exp $ +$OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.3 2010/04/11 12:38:56 ajacoutot Exp $ --- sysdeps/bsd/Makefile.in.orig Tue Mar 30 17:10:14 2010 -+++ sysdeps/bsd/Makefile.in Tue Mar 30 18:10:50 2010 -@@ -61,7 +61,7 @@ am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close - msg_limits.lo sem_limits.lo proclist.lo procstate.lo \ - procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \ - procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \ -- ppp.lo procopenfiles.lo fsusage.lo -+ ppp.lo procopenfiles.lo fsusage.lo procaffinity.lo - libgtop_sysdeps_suid_2_0_la_OBJECTS = \ - $(am_libgtop_sysdeps_suid_2_0_la_OBJECTS) - libgtop_sysdeps_suid_2_0_la_LINK = $(LIBTOOL) --tag=CC \ -@@ -296,7 +296,8 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c c - sem_limits.c proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c prockernel.c \ - procsegment.c procargs.c procmap.c netlist.c \ -- netload.c ppp.c procopenfiles.c fsusage.c -+ netload.c ppp.c procopenfiles.c fsusage.c \ -+ procaffinity.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ ++++ sysdeps/bsd/Makefile.in Sat Apr 10 18:05:08 2010 +@@ -49,7 +49,8 @@ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libgtop_sysdeps_2_0_la_LIBADD = +-am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo ++am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \ ++ procaffinity.lo + libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) + libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -288,7 +289,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c ++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c procaffinity.c + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) + libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ @@ -368,6 +369,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ diff --git a/devel/libgtop2/patches/patch-sysdeps_bsd_sysinfo_c b/devel/libgtop2/patches/patch-sysdeps_bsd_sysinfo_c index e4a02632af4..ca16a94b455 100644 --- a/devel/libgtop2/patches/patch-sysdeps_bsd_sysinfo_c +++ b/devel/libgtop2/patches/patch-sysdeps_bsd_sysinfo_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-sysdeps_bsd_sysinfo_c,v 1.2 2010/04/08 15:57:46 ajacoutot Exp $ +$OpenBSD: patch-sysdeps_bsd_sysinfo_c,v 1.3 2010/04/11 12:38:56 ajacoutot Exp $ --- sysdeps/bsd/sysinfo.c.orig Sun Apr 19 19:51:00 2009 -+++ sysdeps/bsd/sysinfo.c Mon Apr 5 14:23:52 2010 ++++ sysdeps/bsd/sysinfo.c Sat Apr 10 16:57:45 2010 @@ -35,16 +35,49 @@ static glibtop_sysinfo sysinfo = { .flags = 0 }; static void init_sysinfo (glibtop *server) @@ -54,12 +54,22 @@ $OpenBSD: patch-sysdeps_bsd_sysinfo_c,v 1.2 2010/04/08 15:57:46 ajacoutot Exp $ len = sizeof (ncpus); sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); len = 0; -@@ -53,6 +86,8 @@ init_sysinfo (glibtop *server) - sysctlbyname ("hw.model", model, &len, NULL, 0); +@@ -54,6 +87,8 @@ init_sysinfo (glibtop *server) len = sizeof (mhz); sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); -+ -+#endif /* __OpenBSD__ */ ++#endif /* __OpenBSD__ */ ++ for (sysinfo.ncpu = 0; sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus; + sysinfo.ncpu++) { +@@ -78,7 +113,9 @@ init_sysinfo (glibtop *server) + g_strdup_printf("%d", mhz)); + } + ++#ifndef __OpenBSD__ + g_free (model); ++#endif + + sysinfo.flags = _glibtop_sysdeps_sysinfo; + }