diff options
author | is <is> | 2008-12-15 15:37:56 +0000 |
---|---|---|
committer | is <is> | 2008-12-15 15:37:56 +0000 |
commit | 127f2e271073f17133f42bb7352ac0edd18c7819 (patch) | |
tree | 8207c4d8e15db1fbfff0aefc228e8d154fc11e60 /net/icsi-finger | |
parent | e11d0f93f24b37c7fefa7a4fbb03be8f1aca1a68 (diff) | |
download | pkgsrc-127f2e271073f17133f42bb7352ac0edd18c7819.tar.gz |
Make this compile and run on non-NetBSD; tested (as client) on Solaris 10
in addition to NetBSD.
Diffstat (limited to 'net/icsi-finger')
-rw-r--r-- | net/icsi-finger/Makefile | 18 | ||||
-rw-r--r-- | net/icsi-finger/distinfo | 5 | ||||
-rw-r--r-- | net/icsi-finger/files/config.h.netbsd | 306 | ||||
-rw-r--r-- | net/icsi-finger/patches/patch-aa | 4 | ||||
-rw-r--r-- | net/icsi-finger/patches/patch-ah | 68 |
5 files changed, 85 insertions, 316 deletions
diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index e04bf5e5587..de01d314f9e 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2007/03/17 19:29:58 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2008/12/15 15:37:56 is Exp $ # DISTNAME= icsi-finger-1.0.27 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.icsi.berkeley.edu/pub/ai/stolcke/software/ EXTRACT_SUFX= .tar.Z @@ -19,10 +19,16 @@ INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ ${PKGMANDIR}/man8 sbin pre-configure: - ${RM} -f ${WRKSRC}/config.h - ${SED} -e s@/usr/local@${PREFIX}@ \ - -e s@/usr/pkg@${PREFIX}@ \ - files/config.h.netbsd > ${WRKSRC}/config.h + echo \#define ManDir ${PREFIX}/${PKGMANDIR} >> \ + ${WRKSRC}/config.h + echo \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\ + >> ${WRKSRC}/config.h + echo \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \ + >> ${WRKSRC}/config.h + echo \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \ + >> ${WRKSRC}/config.h + echo \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \ + >> ${WRKSRC}/config.h ${MV} -f ${WRKSRC}/support/inetd.conf-add \ ${WRKSRC}/support/inetd.conf-add.bak ${SED} -e s@/usr/local/etc@${PREFIX}/libexec@ \ diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo index 8edeceb50df..ed2c02c7013 100644 --- a/net/icsi-finger/distinfo +++ b/net/icsi-finger/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.6 2006/06/08 14:29:26 joerg Exp $ +$NetBSD: distinfo,v 1.7 2008/12/15 15:37:56 is Exp $ SHA1 (icsi-finger-1.0.27.tar.Z) = 41f03c42269a402169000a6b08ba8c6330256861 RMD160 (icsi-finger-1.0.27.tar.Z) = 92839362b6d4b1893958ca0909654f070e734aa4 Size (icsi-finger-1.0.27.tar.Z) = 729351 bytes -SHA1 (patch-aa) = 2025b8722f863fa7fcda6f4c3640560fd213f866 +SHA1 (patch-aa) = 33d58b9375358e030e03e95ca504d8f6787134cd SHA1 (patch-ab) = d8a719d78288aad8ab3a7159f332afdd59231ebb SHA1 (patch-ac) = e3759d714eafae1cc6a8e974d8a79f065f7efe24 SHA1 (patch-ad) = de1489cf9860bd412a43a875a43eae69dd559606 SHA1 (patch-ae) = 7613ee307bb047d5e5c794b829dcd1cb1c8edb81 SHA1 (patch-af) = 96d691992eecbf08118a924218570325a52603b1 +SHA1 (patch-ah) = edc68dfa08125620b6353f9f762ab6776f6b0597 diff --git a/net/icsi-finger/files/config.h.netbsd b/net/icsi-finger/files/config.h.netbsd deleted file mode 100644 index 0ee20f8998d..00000000000 --- a/net/icsi-finger/files/config.h.netbsd +++ /dev/null @@ -1,306 +0,0 @@ -/* - * config.h -- - * Included in the cpp-Makefile, this file contains defines which control - * the making of GNU Finger. - * - * Id: config.h.netbsd,v 1.1 1998/07/22 12:08:23 is Exp ICSI (Berkeley) - * $NetBSD: config.h.netbsd,v 1.2 1998/08/07 11:10:41 agc Exp $ - */ -#ifndef _CONFIG_H_ -#define _CONFIG_H_ - -#undef SVR4 - -/* Define HAVE_X11 if you are using the X11 window system. */ -#undef HAVE_X11 -#undef HAVE_SUNVIEW -#undef PRINT_WIDGET - -/* Change the definition of FingerDir if you don't want things in the - default place. This directory contains the database of clients to - poll, the serverhost file, and accumulated data about users. - - Change the definition of BinDir and EtcDir to suit your personal - system setup. BinDir is where the user-callable programs go, - (finger, fingerd), while EtcDir is where the inet daemons - go (in.fingerd, in.cfingerd). - - Change the definition of MugShotPath to be a colon-separated list of - directories to search for mugshots (faces). Note that this value - should be surrounded by double quotes. */ - -#define FingerDir /var/run/fingerdir - -#define MugShotPath "/usr/pkg/images/finger" - -#define BinDir /usr/pkg/bin -#define EtcDir /usr/pkg/sbin - -#define ManDir /usr/pkg/man -#define ManExt 1 -#define Man5Ext 5 -#define Man8Ext 8 - -/* Binaries with names identical to standard UNIX versions may be prefixed - e.g., "gfinger" instead of "finger". */ -#define BinPrefix g - -/* Define X11Dir to the root of your X11 installation if you don't - have it spread out around /usr/bin/X11, /usr/lib/X11, /usr/include/X11, etc. - as is the default in the MIT distributions. - Define this to /usr/openwin for Suns that don't have MIT X11 installed. */ -#define X11Dir /usr/X11R6 - -/* Define to please your compiler (as chosen in Makefile) */ -#define CcOptions -O -#define CcLibs - -/* Install commands and flags. The ones below assume a BSD-style install. - A script that has the required functionality can be found in - support/install.sh */ -#define InstallCmd install -c - -#define InstallBin InstallCmd -s -m 755 -#define InstallScript InstallCmd -m 755 -#define InstallMan InstallCmd -m 444 -#define InstallData InstallCmd -m 444 - -/* NB: ./support/install-finger relies on these above defines being - present in this file. If you comment them out, you will have to - do the install by hand. */ - -/* Should we look up system accounting information to fill in the "What" - field for each login? There are at least three good reasons for - not enabling this feature: - 1 - It entails a considerable overhead because in the worst case - the entire (possibly large) accounting file has to be scanned once. - 2 - It may constitute a breach of user privacy to the outside world. - 3 - It is not really useful because all it gives you is the last, not - the current command executed by the user. - However, the accounting information can always be surpressed by - specifying an empty "acctfile" hostconfig attribute, so there is no - real reason to disable it here. */ -#undef WANT_ACCT - -/* Default print widths in short finger output (one login per line). - These refer to the real name, what, hostname, and location field, - respectively. - Since screen real estate is precious you want to adjust this according to - wha is requried for local hostnames etc. It can be changed at runtime - using the -width option. - The field widths probably not add up to more than 49 or the output will - exceed a standard 80 column tty width. (You might want to decrease this - by one if your terminal driver cannot handle 80 character lines without - inserting blank lines). */ -#ifdef WANT_ACCT -#define DEFAULT_WIDTHS 16, 7, 8, 17 -#else -#define DEFAULT_WIDTHS 24, 0, 12, 13 -#endif - -/* **************************************************************** */ -/* */ -/* Defines for FACE parameters */ -/* */ -/* **************************************************************** */ - -/* Define MIT_MUGSHOTS if you store your mugshots in the same format as - the Lisp machine mugshots used at ai.mit.edu. */ -/* #define MIT_MUGSHOTS */ - -/* Define X11_MUGSHOTS if you store your mugshots in X11 bitmap format. */ -/* #define X11_MUGSHOTS */ - -/* Define BITMAP_MUGSHOTS if you want to use the format supplied with GNU - Finger. */ -/* #define BITMAP_MUGSHOTS */ - -/* Define FACE_MUGSHOTS if your faces are stored in the Facesaver format - from uunet.uu.net. *not yet tested* */ -/* #define FACE_MUGSHOTS */ - -/* Define RAST_MUGSHOTS if your mugshots are all of Rastafarians. No, wait, - I mean if your mugshots are stored in Sun (tm) rasterfile format. */ -/* #define RAST_MUGSHOTS */ - -#ifdef PRINT_WIDGET -/* Define PRINT_COMMAND to a parametrized string to build the print - spooling command line. The first string parameter is the printer - name, the second one a PostScript file containing the image to be - printed. */ -#define PRINT_COMMAND "/usr/ucb/lpr -P%s %s" - -/* Define DEFAULT_PRINTER to the printer name used in absence of the - PRINTER environment variable. */ -#define DEFAULT_PRINTER "ps" - -#endif /* PRINT_WIDGET */ - -/* **************************************************************** */ -/* */ -/* Defines for network configuration */ -/* */ -/* **************************************************************** */ - -/* Default number of seconds between polling cycles. */ -#define DEFAULT_POLL_INTERVAL 30 - -/* Maximum number of clients to poll in one cycle. */ -#define DEFAULT_POLL_COUNT 100 - -/* Default number of milliseconds before poll connection attempt times out. */ -#define DEFAULT_CONNECT_TIMEOUT 1000000 - -/* Default number of milliseconds before read from poll connection times out. */ -#define DEFAULT_POLL_TIMEOUT 10000000 - -/* How old the database files maintained by the polling daemon can get before - the software suspects something is wrong and issues a warning. */ -#define MIN_UPDATE_INTERVAL (4 * DEFAULT_POLL_INTERVAL) - -/* Define to a filename that should be looked for in user's home directories - and executed to produce long finger output. Undefine to disable user - script execution. */ -#undef FINGERRC - -/* Define the timeout in seconds used in talking to an RFC 931 server. */ -#define AUTH_TIMEOUT 10 - -/* Define NOBODY_USER to the name of a user the finger reply daemon should run - as in case your inetd doesn't support such a user specification in - /etc/inetd.conf. This also determines the user/group id fingerrc - scripts are run with. Typically these values point to the - anonymous user "nobody" to prevent private information from being - given out inadvertedly. - NEVER leave in.fingerd running as root and have the FINGERRC - mechanism enabled. Even without FINGERRC, in.fingerd running as root - will allow users to circumvent read restrictions on files. */ -#define NOBODY_USER "nobody" - -/* Define USE_SYSLOG to the facility categeory under which you want - error and warning message to be logged. Check /usr/include/syslog.h - for appropriate categories, like LOG_DAEMON or LOG_LOCAL1. - If you have an old 4.2BSD syslog (like Ultrix) that knows no facilities, - define this anyway, to whatever you want. - Leaving USE_SYSLOG undefined will route messages to standard error. - This is not recommended because finger users will see error messages - really meant for the system administrator. */ -/* #undef USE_SYSLOG */ -#define USE_SYSLOG LOG_LOCAL5 - -/* Define CPP_CMD if you want .plan files to be processed by cpp. - If the first character of a .plan file is `#' it is passed through cpp - before it is output. The following symbols are defined for convenience: - LOCAL 0 or 1 depending on where the finger is coming from - YEAR, MONTH, DAY, HOUR, MINUTE the current local time - Actually, you can define CPP_CMD to be any command that understands -D - options like cpp. So m4 would be fine, too, if you prefer that. - - NOTE: This feature is subsumed by the more general FINGERRC functionality - and will disappear soon. Don't enable it if users currently don't rely - on it. - - SECURITY NOTE: This feature should only be used if in.fingerd can be - arranged to run as user nobody. Even then, a user could inadvertedly - give out public, but possibly sensitive information using this feature, - such as the contents of /etc/passwd. However, all such information would - have to be world-readable, and therefore could easily be compromised using - other means, such as copying or mailing to other hosts. Still, BEWARE! */ -#undef CPP_CMD - -/* **************************************************************** */ -/* */ -/* Defines for OS configuration */ -/* */ -/* **************************************************************** */ - -/* - * On the platforms mentioned in README.ICSI, the definitions - * below shouldn't require changes (except maybe USE_HPCLUSTER). - * If not, notify the maintainer. The same applies if you port - * the software to a new platform. - */ - -/* Define SYSV to enable various things that most System V things tend - to do differently from real UNIXes (i.e., BSD). This includes the - location of the mail spool and various system calls. SYSV is just - an attempt to get things right most of the time, but you may have to - replace more specific #ifdef's where this fails. */ -#undef SYSV - -/* Define USE_LASTLOG if your system has a lastlog(5) database. - This will cause finger to accurately initialize its user database from - the information found in that file. */ -#if !defined(SYSV) || defined(sgi) || defined(__osf__) || defined(SVR4) || defined(linux) -#define USE_LASTLOG -#endif - -/* Define USE_TTYENT if your system has a getttyent(3) function - and you want to use the comment fields in the system's tty database file - as a fallback resource for tty locations. */ -#if !defined(SYSV) || defined(__osf__) -#define USE_TTYENT -#endif - -/* Define HAVE_UTMPX if your system supports an extended utmp database - (including, among other things, full remote hostnames). Look for - /usr/include/utmpx.h. */ -#if defined(SVR4) -#define HAVE_UTMPX -#endif - -#undef HAVE_XUTMP - -/* Define HAVE_UTHOST if your utmp records contain the ut_host field - recording the origin of remote logins (or the display names of - X11 terminal emulators). This is a major win in determining the - `Where' filed of finger packets. Check /usr/include/utmp.h to verify. */ -#define HAVE_UTHOST - -#undef NEED_UALARM -#undef NEED_FLOCK -#undef NEED_GETUSERSHELL -#define HAVE_GETDOMAINNAME - -/* Define KEYBOARD to a device name whose access time is indicative of console - (e.g., keyboard or mouse) input. Same for KEYBOARD2 if there is more than - one such device. Make sure these device names are NOT "console". */ - -#define KEYBOARD "kbd" -#define KEYBOARD2 "mouse" - -#define MAILDIR "/var/mail" - - -#ifdef __STRICT_BSD__ -#define SIGRET int -#endif - -#define HAVE_VFORK - -#define HAVE_DIRENT - -#undef HAVE_MEMORY - -#undef HAVE_RASTERFILE - -/* Accounting file location (defaults should work in most cases) */ -#ifdef linux -#define ACCT_FILE "/var/log/pacct" -#endif - -/* Define USE_DBMALLOC only if you are a finger hacker and want to - debug heap management. It assumes Conor P. Cahill's dbmalloc package - is accessible with #include <debug/malloc.h> and -ldbmalloc. */ -/* #define USE_DBMALLOC */ - -#define TTYLOCFILE "/usr/pkg/etc/fingerdir/ttylocs" - -/* File with miscellaneous host configuration info. */ -#define HOSTCONFIGFILE "/usr/pkg/etc/fingerdir/hostconfig" - -/* Directory to look for special target scripts in */ -#define TargetDir /usr/pkg/etc/fingerdir/targets -#define TARGETDIR "/usr/pkg/etc/fingerdir/targets" - -#endif /* _CONFIG_H_ */ diff --git a/net/icsi-finger/patches/patch-aa b/net/icsi-finger/patches/patch-aa index a5027a46b63..88aaeb8854c 100644 --- a/net/icsi-finger/patches/patch-aa +++ b/net/icsi-finger/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2006/06/08 14:29:26 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2008/12/15 15:37:56 is Exp $ --- lib/error.c.orig 1998-04-04 22:38:04.000000000 +0000 +++ lib/error.c @@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.4 2006/06/08 14:29:26 joerg Exp $ - char *error_text; + const char *error_text; -+#ifdef __INTERIX ++#if 1 /* was defined( __INTERIX) */ + error_text = strerror(errno); +#else if (errno) { diff --git a/net/icsi-finger/patches/patch-ah b/net/icsi-finger/patches/patch-ah new file mode 100644 index 00000000000..b45b948c084 --- /dev/null +++ b/net/icsi-finger/patches/patch-ah @@ -0,0 +1,68 @@ +$NetBSD: patch-ah,v 1.1 2008/12/15 15:37:56 is Exp $ + +--- config.h.orig 1997-10-27 20:44:06.000000000 +0100 ++++ config.h +@@ -12,38 +12,35 @@ + * + */ + +-#undef InstallCmd +-#define InstallCmd /usr/local/etc/install -c +- +-#if defined(sun) && !defined(__svr4__) +-#undef X11Dir /* use own X11R6 on old SunOS */ +-#endif +- +-#ifndef X11Dir +-#ifndef sgi +-#define X11Dir /usr/local/X11R6 +-#endif +-#endif +- +-#ifdef bsdi +-#undef X11Dir +-#define X11Dir /usr/X11 + #undef FingerDir +-#define FingerDir /var/spool/fingerdir +-#endif ++#define FingerDir /var/run/fingerdir ++ ++#undef MugShotPath ++#define MugShotPath "/usr/pkg/images/finger" ++ ++#undef BinDir ++#define BinDir /usr/pkg/bin ++ ++#undef EtcDir ++#define EtcDir /usr/pkg/sbin + +-#ifdef ultrix +-/* +- * Standard ultrix man(1) cannot handle multiple man directories. +- */ + #undef ManDir + #undef ManExt + #undef Man5Ext + #undef Man8Ext +-#define ManDir /usr/man +-#define ManExt l +-#define Man5Ext l +-#define Man8Ext l +-#endif /* ultrix */ + +-/* #define USE_DBMALLOC */ ++#define ManExt 1 ++#define Man5Ext 5 ++#define Man8Ext 8 ++ ++/* Binaries with names identical to standard UNIX versions may be prefixed ++ e.g., "gfinger" instead of "finger". */ ++#undef BinPrefix ++#define BinPrefix g ++ ++#undef HAVE_X11 ++#undef HAVE_SUNVIEW ++#undef PRINT_WIDGET ++ ++#undef MAILDIR ++#define MAILDIR "/var/mail" |