diff options
| author | bland <bland@FreeBSD.org> | 2003-11-04 06:55:16 +0000 |
|---|---|---|
| committer | bland <bland@FreeBSD.org> | 2003-11-04 06:55:16 +0000 |
| commit | e9c6609e696160053bc687c7d3c7256fb11f9cb2 (patch) | |
| tree | 3c730a21887576fe840adefe1ccffd380041afdb /devel/libgtop2/files | |
| parent | cce0decee29385306fac62063b50fb5b9de9817f (diff) | |
| download | FreeBSD-ports-e9c6609e696160053bc687c7d3c7256fb11f9cb2.zip FreeBSD-ports-e9c6609e696160053bc687c7d3c7256fb11f9cb2.tar.gz | |
Kick off local gnome-support nonsense. All we need is libpopt.
This also unscrew pkgconfig database.
Diffstat (limited to 'devel/libgtop2/files')
| -rw-r--r-- | devel/libgtop2/files/patch-configure | 34 | ||||
| -rw-r--r-- | devel/libgtop2/files/patch-src::daemon::gnuserv.c | 25 |
2 files changed, 49 insertions, 10 deletions
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure index 42b3620..e451557 100644 --- a/devel/libgtop2/files/patch-configure +++ b/devel/libgtop2/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Sat Oct 25 00:01:15 2003 -+++ configure Sat Oct 25 00:14:56 2003 +--- configure.orig Tue Nov 4 14:55:15 2003 ++++ configure Tue Nov 4 15:10:15 2003 @@ -1580,10 +1580,10 @@ # The aliases save the names the user supplied, while $host etc. @@ -28,6 +28,36 @@ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' +@@ -20821,7 +20821,7 @@ + + + # this should go away soon +- need_gnome_support=yes ++ need_gnome_support=no + + + for ac_func in getopt_long +@@ -30052,13 +30052,13 @@ + + fi; + +-if test "x$gnome_found" = xyes ; then +- LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport" +- SUPPORTINCS="$GNOME_INCLUDEDIR" +-else +- LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la' +- SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' +-fi ++#if test "x$gnome_found" = xyes ; then ++# LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport" ++# SUPPORTINCS="$GNOME_INCLUDEDIR" ++#else ++# LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la' ++# SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' ++#fi + + case "$GNOME_LIBS" in + '*-lgnomesupport*' ) @@ -30160,7 +30160,7 @@ diff --git a/devel/libgtop2/files/patch-src::daemon::gnuserv.c b/devel/libgtop2/files/patch-src::daemon::gnuserv.c index 8b0712a..a398b2a 100644 --- a/devel/libgtop2/files/patch-src::daemon::gnuserv.c +++ b/devel/libgtop2/files/patch-src::daemon::gnuserv.c @@ -1,15 +1,24 @@ ---- src/daemon/gnuserv.c.orig Thu Nov 29 08:58:40 2001 -+++ src/daemon/gnuserv.c Thu Nov 29 08:58:17 2001 -@@ -200,6 +200,12 @@ +--- src/daemon/gnuserv.c.orig Mon Oct 20 01:54:32 2003 ++++ src/daemon/gnuserv.c Tue Nov 4 15:22:38 2003 +@@ -42,7 +42,7 @@ + #include <glibtop/gnuserv.h> - auth_data_len = atoi (buf); + #include <errno.h> +-#include <popt-gnome.h> ++#include <popt.h> -+ if (auth_data_len < 1 || auth_data_len > sizeof(buf)) { -+ syslog_message(LOG_WARNING, -+ "Invalid data length supplied by client"); + #include "daemon.h" + +@@ -202,6 +202,12 @@ + + if (auth_data_len < 1 || auth_data_len > sizeof(buf)) { + syslog_message(LOG_WARNING, "Invalid data length supplied by client"); + return FALSE; + } + - if (timed_read (fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len) ++ if (auth_data_len < 1 || auth_data_len > sizeof(buf)) { ++ syslog_message(LOG_WARNING, ++ "Invalid data length supplied by client"); return FALSE; + } |
