diff -ruN --exclude=CVS /usr/ports/security/ident2/Makefile /usr/home/chinsan/project/ident2/Makefile --- /usr/ports/security/ident2/Makefile Sat Apr 17 00:25:36 2004 +++ /usr/home/chinsan/project/ident2/Makefile Sat Dec 2 22:17:56 2006 @@ -6,8 +6,7 @@ # PORTNAME= ident2 -PORTVERSION= 1.04 -PORTREVISION= 1 +PORTVERSION= 1.07 CATEGORIES= security net MASTER_SITES= http://michael.bacarella.com/projects/ident2/ DISTNAME= ident2-v${PORTVERSION}_FINAL @@ -16,8 +15,13 @@ COMMENT= An RFC1413 identification server which also supports random replies USE_BZIP2= yes +USE_GETOPT_LONG=yes GNU_CONFIGURE= yes MAN8= ident2.8 PLIST_FILES= sbin/ident2 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/ident2 ${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8/ .include diff -ruN --exclude=CVS /usr/ports/security/ident2/distinfo /usr/home/chinsan/project/ident2/distinfo --- /usr/ports/security/ident2/distinfo Tue Jan 24 09:03:03 2006 +++ /usr/home/chinsan/project/ident2/distinfo Sat Dec 2 21:46:45 2006 @@ -1,3 +1,3 @@ -MD5 (ident2-v1.04_FINAL.tar.bz2) = 1b9966d289d64976fd12529c26470508 -SHA256 (ident2-v1.04_FINAL.tar.bz2) = 2dd4467dfb6d2565a3885596f017ce0deb7a8ca6d5aa355bae9da2dd89f8b8fe -SIZE (ident2-v1.04_FINAL.tar.bz2) = 34968 +MD5 (ident2-v1.07_FINAL.tar.bz2) = be8e2d37a2a9338aeea9933ddda413e9 +SHA256 (ident2-v1.07_FINAL.tar.bz2) = 42d819862da94f7eeefb072e6cbdb0c5a0c38f3ba52e6eeb73641e72826e9a11 +SIZE (ident2-v1.07_FINAL.tar.bz2) = 49411 diff -ruN --exclude=CVS /usr/ports/security/ident2/files/patch-Makefile.in /usr/home/chinsan/project/ident2/files/patch-Makefile.in --- /usr/ports/security/ident2/files/patch-Makefile.in Sun Feb 24 20:35:05 2002 +++ /usr/home/chinsan/project/ident2/files/patch-Makefile.in Thu Jan 1 08:00:00 1970 @@ -1,21 +0,0 @@ ---- Makefile.in.orig Mon Sep 13 08:35:42 1999 -+++ Makefile.in Sun Feb 24 15:33:36 2002 -@@ -29,15 +29,15 @@ - RANLIB = @RANLIB@ - - CC = @CC@ --CFLAGS = -Wall -O2 -+CFLAGS = @CFLAGS@ - INSTALL = @INSTALL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - doc_format = @doc_format@ - - PROG = ident2 --BINDIR = /usr/local/sbin --MANDIR = /usr/local/man/man8 -+BINDIR = ${prefix}/sbin -+MANDIR = ${prefix}/man/man8 - - SOURCES=ident2.c common.c daemon.c m_${MACHTARGET}.c - OBJS=ident2.o common.o daemon.o machine.o diff -ruN --exclude=CVS /usr/ports/security/ident2/files/patch-common.c /usr/home/chinsan/project/ident2/files/patch-common.c --- /usr/ports/security/ident2/files/patch-common.c Sat Apr 17 00:25:36 2004 +++ /usr/home/chinsan/project/ident2/files/patch-common.c Thu Jan 1 08:00:00 1970 @@ -1,53 +0,0 @@ -*** common.c.orig Fri Apr 16 10:02:41 2004 ---- common.c Fri Apr 16 10:17:43 2004 -*************** -*** 41,63 **** - /* - * a (skewed) fgets() that works on file descriptors - * the '\r' charecter is ignored - */ - static int -! _getl (int d, char *p, u_short l) - { -! size_t n = 0; - -! while (read (d, p, 1) == 1) { - if (*p == '\n') - break; - if (*p == '\r') - p--; /* ignore \r */ -- p++; -- if (n++ >= l) -- break; - } -! *p = 0; -! return n; - } - - /* ---- 41,65 ---- - /* - * a (skewed) fgets() that works on file descriptors - * the '\r' charecter is ignored -+ * returns the number of bytes written into the given -+ * buffer, including the terminating NUL - */ - static int -! _getl (int d, char *begin, u_short l) - { -! char *p, *end; - -! end = &begin[l-1]; /* leave room for terminating NUL */ -! for (p = begin; p < end; ++p) { -! if (read (d, p, 1) != 1) -! break; - if (*p == '\n') - break; - if (*p == '\r') - p--; /* ignore \r */ - } -! *p++ = 0; -! return p-begin; - } - - /* diff -ruN --exclude=CVS /usr/ports/security/ident2/files/patch-ident2.c /usr/home/chinsan/project/ident2/files/patch-ident2.c --- /usr/ports/security/ident2/files/patch-ident2.c Wed Oct 15 20:49:05 2003 +++ /usr/home/chinsan/project/ident2/files/patch-ident2.c Thu Jan 1 08:00:00 1970 @@ -1,111 +0,0 @@ ---- ident2.c.orig Wed Oct 15 05:45:40 2003 -+++ ident2.c Wed Oct 15 05:46:50 2003 -@@ -75,8 +75,8 @@ - { - print_header(); - puts( --" ident2 is free software, and you are welcome to redistribute it -- under certain conditions; ident2 comes with ABSOLUTELY NO WARRANTY; -+" ident2 is free software, and you are welcome to redistribute it \n\ -+ under certain conditions; ident2 comes with ABSOLUTELY NO WARRANTY; \n\ - for details, go to http://www.gnu.org/\n"); - } - -@@ -86,53 +86,53 @@ - print_header(); - #ifdef HAS_GETOPT_LONG - puts ( --"usage: ident2 [options] --options: -- --these parameters apply to all incarnations of ident2 -- -- -h --help this command line information -- -u --usage shows example command lines -- -v --version show version information -- -l --license show licensing information -- -a --force-inetd force inetd mode -- -d --force-daemon force standalone daemon -- -i --use-user-ident allow user defined ident replies -- -y --user-reply-file file in user's homedir for replies -- -n --allow-noident-file don't reply if user has a ~/NOIDENT file -- -o --client-timeout clients timeout after this many secs -- -s --dont-change-uid don't try to change uid (to nobody) -- -r --always-random always send a random reply -- --these parameters only apply to the daemon ident2 -- -- -m --daemon-maxclients accept no more than this many clients -- -p --daemon-port bind this port, instead of 'auth' -+"usage: ident2 [options] \n\ -+options: \n\ -+ \n\ -+these parameters apply to all incarnations of ident2 \n\ -+\n\ -+ -h --help this command line information\n\ -+ -u --usage shows example command lines\n\ -+ -v --version show version information\n\ -+ -l --license show licensing information\n\ -+ -a --force-inetd force inetd mode\n\ -+ -d --force-daemon force standalone daemon\n\ -+ -i --use-user-ident allow user defined ident replies\n\ -+ -y --user-reply-file file in user's homedir for replies\n\ -+ -n --allow-noident-file don't reply if user has a ~/NOIDENT file\n\ -+ -o --client-timeout clients timeout after this many secs\n\ -+ -s --dont-change-uid don't try to change uid (to nobody)\n\ -+ -r --always-random always send a random reply\n\ -+ \n\ -+these parameters only apply to the daemon ident2\n\ -+\n\ -+ -m --daemon-maxclients accept no more than this many clients\n\ -+ -p --daemon-port bind this port, instead of 'auth'\n\ - "); - #else - puts( --"usage: ident2 [options] --options: -- --these parameters apply to all incarnations of ident2 -- -- -h this command line information -- -u shows example command lines -- -v show version information -- -l show licensing information -- -a force inetd mode -- -d force standalone daemon -- -i allow user defined ident replies -- -y file in user's homedir for replies -- -n don't reply if user has a ~/NOIDENT file -- -o clients timeout after this many secs -- -s don't try to change uid (ex: to nobody) -- -r always send a random reply, even to bad requests -- --these parameters only apply to the daemon ident2 -- -- -m accept no more than this many clients -- -p bind this port, instead of 'auth' -+"usage: ident2 [options]\n\ -+options:\n\ -+\n\ -+these parameters apply to all incarnations of ident2\n\ -+\n\ -+ -h this command line information\n\ -+ -u shows example command lines\n\ -+ -v show version information\n\ -+ -l show licensing information\n\ -+ -a force inetd mode\n\ -+ -d force standalone daemon\n\ -+ -i allow user defined ident replies\n\ -+ -y file in user's homedir for replies\n\ -+ -n don't reply if user has a ~/NOIDENT file\n\ -+ -o clients timeout after this many secs\n\ -+ -s don't try to change uid (ex: to nobody)\n\ -+ -r always send a random reply, even to bad requests\n\ -+ \n\ -+these parameters only apply to the daemon ident2\n\ -+\n\ -+ -m accept no more than this many clients\n\ -+ -p bind this port, instead of 'auth'\n\ - "); - #endif -p --daemon-port bind this port, instead of 'auth' - }