Index: head/security/chrootuid/files/patch-aa =================================================================== --- head/security/chrootuid/files/patch-aa (revision 363327) +++ head/security/chrootuid/files/patch-aa (nonexistent) @@ -1,8 +0,0 @@ ---- chrootuid.1.orig Wed Jul 25 09:46:59 2001 -+++ chrootuid.1 Sun Jun 23 15:01:19 2002 -@@ -1,4 +1,4 @@ --.TH CHROOTUID 1 -+.TH CHROOTUID 8 - .ad - .fi - .SH NAME Property changes on: head/security/chrootuid/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/chrootuid/files/patch-ab =================================================================== --- head/security/chrootuid/files/patch-ab (revision 363327) +++ head/security/chrootuid/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig Thu Aug 12 07:09:31 1993 -+++ Makefile Sun Jun 23 15:01:35 2002 -@@ -1,7 +1,7 @@ - # @(#) Makefile 1.2 93/08/12 16:09:29 - - FILES = README Makefile chrootuid.c chrootuid.1 --CFLAGS = -O -+CFLAGS ?= -O - - all: chrootuid chrootuid.1 - Property changes on: head/security/chrootuid/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/chrootuid/files/patch-ac =================================================================== --- head/security/chrootuid/files/patch-ac (revision 363327) +++ head/security/chrootuid/files/patch-ac (nonexistent) @@ -1,13 +0,0 @@ ---- chrootuid.c.orig Wed Jul 25 09:47:44 2001 -+++ chrootuid.c Sun Jun 23 15:06:10 2002 -@@ -81,6 +81,10 @@ - syslog(LOG_ERR, "usage: %s path user command", argv[0]); - return (0); - } -+ -+ syslog(LOG_NOTICE, "chrootuid: dir(%s) user(%s) command(%s)", -+ argv[1], argv[2], argv[3]); -+ - /* Must step into the new subtree. */ - - if (chdir(argv[1])) { Property changes on: head/security/chrootuid/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/chrootuid/files/patch-Makefile =================================================================== --- head/security/chrootuid/files/patch-Makefile (nonexistent) +++ head/security/chrootuid/files/patch-Makefile (revision 363328) @@ -0,0 +1,11 @@ +--- Makefile.orig Thu Aug 12 07:09:31 1993 ++++ Makefile Sun Jun 23 15:01:35 2002 +@@ -1,7 +1,7 @@ + # @(#) Makefile 1.2 93/08/12 16:09:29 + + FILES = README Makefile chrootuid.c chrootuid.1 +-CFLAGS = -O ++CFLAGS ?= -O + + all: chrootuid chrootuid.1 + Property changes on: head/security/chrootuid/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/chrootuid/files/patch-chrootuid.1 =================================================================== --- head/security/chrootuid/files/patch-chrootuid.1 (nonexistent) +++ head/security/chrootuid/files/patch-chrootuid.1 (revision 363328) @@ -0,0 +1,8 @@ +--- chrootuid.1.orig Wed Jul 25 09:46:59 2001 ++++ chrootuid.1 Sun Jun 23 15:01:19 2002 +@@ -1,4 +1,4 @@ +-.TH CHROOTUID 1 ++.TH CHROOTUID 8 + .ad + .fi + .SH NAME Property changes on: head/security/chrootuid/files/patch-chrootuid.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/chrootuid/files/patch-chrootuid.c =================================================================== --- head/security/chrootuid/files/patch-chrootuid.c (nonexistent) +++ head/security/chrootuid/files/patch-chrootuid.c (revision 363328) @@ -0,0 +1,13 @@ +--- chrootuid.c.orig Wed Jul 25 09:47:44 2001 ++++ chrootuid.c Sun Jun 23 15:06:10 2002 +@@ -81,6 +81,10 @@ + syslog(LOG_ERR, "usage: %s path user command", argv[0]); + return (0); + } ++ ++ syslog(LOG_NOTICE, "chrootuid: dir(%s) user(%s) command(%s)", ++ argv[1], argv[2], argv[3]); ++ + /* Must step into the new subtree. */ + + if (chdir(argv[1])) { Property changes on: head/security/chrootuid/files/patch-chrootuid.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/cops/files/patch-aa =================================================================== --- head/security/cops/files/patch-aa (revision 363327) +++ head/security/cops/files/patch-aa (nonexistent) @@ -1,32 +0,0 @@ ---- perl/cops.orig Sat Feb 21 19:20:10 1998 -+++ perl/cops Sat Feb 21 19:21:06 1998 -@@ -1,8 +1,4 @@ --#!/bin/sh -- need to mention perl here to avoid recursion --'true' || eval 'exec perl -S $0 $argv:q'; --eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' --& eval 'exec /usr/local/bin/perl -S $0 $argv:q' -- if 0; -+#!/usr/bin/perl - - # - # Usage: cops [-vx] [-c config file] [-s secure_dir] [architecture] -@@ -83,7 +79,7 @@ - - # Read stuff to do from the config file - die "$0: Can't trust $CONFIG to reconfig!\n" if &'is_writable($CONFIG); --open CONFIG || die "can't open $CONFIG: $!"; -+open (CONFIG) || die "can't open $CONFIG: $!"; - - &argh unless -s $CONFIG; - -@@ -219,8 +215,8 @@ - } - return 1 if (($FILE2 eq "") || (-s $FILE1 != -s $report)); - -- open FILE1 || die "can't open $FILE1: $!\n"; -- open FILE2 || die "can't open $FILE2: $!\n"; -+ open (FILE1) || die "can't open $FILE1: $!\n"; -+ open (FILE2) || die "can't open $FILE2: $!\n"; - - for (1..5) { - $_ = ; Property changes on: head/security/cops/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/cops/files/patch-ab =================================================================== --- head/security/cops/files/patch-ab (revision 363327) +++ head/security/cops/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- makefile.orig Tue Mar 9 02:19:18 1993 -+++ makefile Tue Jul 11 21:44:29 2000 -@@ -23,7 +23,7 @@ - # C2 = -DC2 - - # --CFLAGS = -O $(C2) -+CFLAGS+ = $(C2) - # sequents need "-lseq" as well... uncomment this if you're running on one: - # SEQFLAGS = -lseq - Property changes on: head/security/cops/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/cops/files/patch-makefile =================================================================== --- head/security/cops/files/patch-makefile (nonexistent) +++ head/security/cops/files/patch-makefile (revision 363328) @@ -0,0 +1,11 @@ +--- makefile.orig Tue Mar 9 02:19:18 1993 ++++ makefile Tue Jul 11 21:44:29 2000 +@@ -23,7 +23,7 @@ + # C2 = -DC2 + + # +-CFLAGS = -O $(C2) ++CFLAGS+ = $(C2) + # sequents need "-lseq" as well... uncomment this if you're running on one: + # SEQFLAGS = -lseq + Property changes on: head/security/cops/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/cops/files/patch-perl__cops =================================================================== --- head/security/cops/files/patch-perl__cops (nonexistent) +++ head/security/cops/files/patch-perl__cops (revision 363328) @@ -0,0 +1,32 @@ +--- perl/cops.orig Sat Feb 21 19:20:10 1998 ++++ perl/cops Sat Feb 21 19:21:06 1998 +@@ -1,8 +1,4 @@ +-#!/bin/sh -- need to mention perl here to avoid recursion +-'true' || eval 'exec perl -S $0 $argv:q'; +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' +-& eval 'exec /usr/local/bin/perl -S $0 $argv:q' +- if 0; ++#!/usr/bin/perl + + # + # Usage: cops [-vx] [-c config file] [-s secure_dir] [architecture] +@@ -83,7 +79,7 @@ + + # Read stuff to do from the config file + die "$0: Can't trust $CONFIG to reconfig!\n" if &'is_writable($CONFIG); +-open CONFIG || die "can't open $CONFIG: $!"; ++open (CONFIG) || die "can't open $CONFIG: $!"; + + &argh unless -s $CONFIG; + +@@ -219,8 +215,8 @@ + } + return 1 if (($FILE2 eq "") || (-s $FILE1 != -s $report)); + +- open FILE1 || die "can't open $FILE1: $!\n"; +- open FILE2 || die "can't open $FILE2: $!\n"; ++ open (FILE1) || die "can't open $FILE1: $!\n"; ++ open (FILE2) || die "can't open $FILE2: $!\n"; + + for (1..5) { + $_ = ; Property changes on: head/security/cops/files/patch-perl__cops ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/fakebo/files/patch-ab =================================================================== --- head/security/fakebo/files/patch-ab (revision 363327) +++ head/security/fakebo/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- fakebo.c.orig Thu Jun 6 18:13:21 2002 -+++ fakebo.c Thu Jun 6 18:13:31 2002 -@@ -457,8 +457,8 @@ - { - static char msg[] = "Warning: SIGHUP received, but config re-read not yet implemented!\n"; - -- logprintf(TRUE, msg); -- syslogprintf(msg); -+ logprintf(TRUE, "%s", msg); -+ syslogprintf("%s", msg); - } - - #endif Property changes on: head/security/fakebo/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/fakebo/files/patch-fakebo.c =================================================================== --- head/security/fakebo/files/patch-fakebo.c (nonexistent) +++ head/security/fakebo/files/patch-fakebo.c (revision 363328) @@ -0,0 +1,13 @@ +--- fakebo.c.orig Thu Jun 6 18:13:21 2002 ++++ fakebo.c Thu Jun 6 18:13:31 2002 +@@ -457,8 +457,8 @@ + { + static char msg[] = "Warning: SIGHUP received, but config re-read not yet implemented!\n"; + +- logprintf(TRUE, msg); +- syslogprintf(msg); ++ logprintf(TRUE, "%s", msg); ++ syslogprintf("%s", msg); + } + + #endif Property changes on: head/security/fakebo/files/patch-fakebo.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/fwbuilder/files/patch-aa =================================================================== --- head/security/fwbuilder/files/patch-aa (revision 363327) +++ head/security/fwbuilder/files/patch-aa (nonexistent) @@ -1,22 +0,0 @@ ---- qmake.inc.in.orig 2011-04-20 10:48:53.000000000 -0700 -+++ qmake.inc.in 2011-05-08 13:57:57.471497111 -0700 -@@ -17,7 +17,6 @@ - - # CONFIG -= nostrip - # CONFIG += release --CONFIG += debug - - unix { - PREFIX = @PREFIX@ -@@ -35,11 +34,6 @@ - MOC_DIR = .moc - OBJECTS_DIR = .obj - -- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter -- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter -- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -- - !macx { - - exec_prefix = @EXEC_PREFIX@ Property changes on: head/security/fwbuilder/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/fwbuilder/files/patch-qmake.inc.in =================================================================== --- head/security/fwbuilder/files/patch-qmake.inc.in (nonexistent) +++ head/security/fwbuilder/files/patch-qmake.inc.in (revision 363328) @@ -0,0 +1,22 @@ +--- qmake.inc.in.orig 2011-04-20 10:48:53.000000000 -0700 ++++ qmake.inc.in 2011-05-08 13:57:57.471497111 -0700 +@@ -17,7 +17,6 @@ + + # CONFIG -= nostrip + # CONFIG += release +-CONFIG += debug + + unix { + PREFIX = @PREFIX@ +@@ -35,11 +34,6 @@ + MOC_DIR = .moc + OBJECTS_DIR = .obj + +- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter +- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter +- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter +- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter +- + !macx { + + exec_prefix = @EXEC_PREFIX@ Property changes on: head/security/fwbuilder/files/patch-qmake.inc.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/identify/files/patch-aa =================================================================== --- head/security/identify/files/patch-aa (revision 363327) +++ head/security/identify/files/patch-aa (nonexistent) @@ -1,16 +0,0 @@ ---- Makefile.orig Mon Jul 20 09:01:27 1992 -+++ Makefile Fri Apr 2 10:50:40 1999 -@@ -1,2 +1,11 @@ --identify: identify.c -- $(CC) -o identify identify.c -lauthuser -+ -+CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -+ -+all: identify -+ -+install: identify -+ install identify ${PREFIX}/libexec -+ install README ${PREFIX}/share/doc/identify -+ -+identify: identify.o -+ $(CC) $(CFLAGS) -o identify identify.o -lident Property changes on: head/security/identify/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/identify/files/patch-ab =================================================================== --- head/security/identify/files/patch-ab (revision 363327) +++ head/security/identify/files/patch-ab (nonexistent) @@ -1,141 +0,0 @@ ---- identify.c.orig Tue Feb 2 01:51:57 1993 -+++ identify.c Sun Oct 20 17:53:44 2002 -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -33,57 +33,43 @@ - int noidentify = 0; - int bits = 0; - int reject_flag = 0; --unsigned long inlocal; --unsigned long inremote; -+struct in_addr inlocal; -+struct in_addr inremote; - int timeout = 120; --int rtimeout = 30; -- --static char *host_address(ad) -- unsigned long ad; --{ -- int a, b, c, d; -- static char addr[20]; -- -- d = ad % 256; -- ad /= 256; -- c = ad % 256; -- ad /= 256; -- b = ad % 256; -- a = ad / 256; -- sprintf(addr, "%d.%d.%d.%d", a, b, c, d); -- -- return addr; --} -- - - char *ident_get_identifier(fd, host, len) - int fd; - char *host; - int len; - { -- unsigned short local; -- unsigned short remote; -- -+ struct sockaddr_in sa; -+ int l; - -- if (auth_fd2(fd, &inlocal, &inremote, -- &local, &remote) == -1) -+ l=sizeof(sa); -+ if (getsockname(fd,(struct sockaddr *)&sa,&l)<0) - { - if (debug) -- perror("auth_fd2"); -- -+ perror("getsockname()"); - return NULL; - } -+ inlocal=sa.sin_addr; -+ if (getpeername(fd,(struct sockaddr *)&sa,&l)<0) -+ { -+ if (debug) -+ perror("getpeername()"); -+ return NULL; -+ } -+ inremote=sa.sin_addr; - - if (host) - { - struct hostent *hp; - -- -- hp = gethostbyaddr(&inremote,sizeof(struct in_addr),AF_INET); -+ hp = gethostbyaddr((const char *)&inremote,sizeof(struct in_addr),AF_INET); - if (hp) - strncpy(host, hp->h_name, len); - else -- strncpy(host, host_address(inremote), len); -+ strncpy(host, inet_ntoa(inremote), len); - - host[len] = '\0'; - } -@@ -91,16 +77,7 @@ - if (noidentify) - return NULL; - else -- if (timeout) -- { -- if (rtimeout) -- return auth_tcpuser4(inlocal, inremote, local, remote, timeout, -- rtimeout); -- else -- return auth_tcpuser3(inlocal, inremote, local, remote, timeout); -- } -- else -- return auth_tcpuser2(inlocal, inremote, local, remote); -+ return ident_id(fd,timeout); - } - - -@@ -128,10 +105,6 @@ - timeout = atoi(argv[i]+2); - break; - -- case 'T': -- rtimeout = atoi(argv[i]+2); -- break; -- - case 'R': - if (!argv[i][2]) - reject_flag = 1; -@@ -200,7 +173,7 @@ - { - /* In child, let's fork again so we can forget about this child */ - if (fork()) -- _exit(); -+ _exit(0); - } - else - { -@@ -241,13 +214,13 @@ - } - } - -- if ((bits && (inremote >> bits != inlocal >> bits)) || -+ if ((bits && (htonl(inremote.s_addr) >> bits != htonl(inlocal.s_addr) >> bits)) || - (reject_flag && !id)) - { - if (id) -- syslog(priority, "Rejecting from %s@%s", id, host_address(inremote)); -+ syslog(priority, "Rejecting from %s@%s", id, inet_ntoa(inremote)); - else -- syslog(priority, "Rejecting from %s", host_address(inremote)); -+ syslog(priority, "Rejecting from %s", inet_ntoa(inremote)); - exit(1); - } - Property changes on: head/security/identify/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/identify/files/patch-Makefile =================================================================== --- head/security/identify/files/patch-Makefile (nonexistent) +++ head/security/identify/files/patch-Makefile (revision 363328) @@ -0,0 +1,16 @@ +--- Makefile.orig Mon Jul 20 09:01:27 1992 ++++ Makefile Fri Apr 2 10:50:40 1999 +@@ -1,2 +1,11 @@ +-identify: identify.c +- $(CC) -o identify identify.c -lauthuser ++ ++CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib ++ ++all: identify ++ ++install: identify ++ install identify ${PREFIX}/libexec ++ install README ${PREFIX}/share/doc/identify ++ ++identify: identify.o ++ $(CC) $(CFLAGS) -o identify identify.o -lident Property changes on: head/security/identify/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/identify/files/patch-identify.c =================================================================== --- head/security/identify/files/patch-identify.c (nonexistent) +++ head/security/identify/files/patch-identify.c (revision 363328) @@ -0,0 +1,141 @@ +--- identify.c.orig Tue Feb 2 01:51:57 1993 ++++ identify.c Sun Oct 20 17:53:44 2002 +@@ -11,7 +11,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -33,57 +33,43 @@ + int noidentify = 0; + int bits = 0; + int reject_flag = 0; +-unsigned long inlocal; +-unsigned long inremote; ++struct in_addr inlocal; ++struct in_addr inremote; + int timeout = 120; +-int rtimeout = 30; +- +-static char *host_address(ad) +- unsigned long ad; +-{ +- int a, b, c, d; +- static char addr[20]; +- +- d = ad % 256; +- ad /= 256; +- c = ad % 256; +- ad /= 256; +- b = ad % 256; +- a = ad / 256; +- sprintf(addr, "%d.%d.%d.%d", a, b, c, d); +- +- return addr; +-} +- + + char *ident_get_identifier(fd, host, len) + int fd; + char *host; + int len; + { +- unsigned short local; +- unsigned short remote; +- ++ struct sockaddr_in sa; ++ int l; + +- if (auth_fd2(fd, &inlocal, &inremote, +- &local, &remote) == -1) ++ l=sizeof(sa); ++ if (getsockname(fd,(struct sockaddr *)&sa,&l)<0) + { + if (debug) +- perror("auth_fd2"); +- ++ perror("getsockname()"); + return NULL; + } ++ inlocal=sa.sin_addr; ++ if (getpeername(fd,(struct sockaddr *)&sa,&l)<0) ++ { ++ if (debug) ++ perror("getpeername()"); ++ return NULL; ++ } ++ inremote=sa.sin_addr; + + if (host) + { + struct hostent *hp; + +- +- hp = gethostbyaddr(&inremote,sizeof(struct in_addr),AF_INET); ++ hp = gethostbyaddr((const char *)&inremote,sizeof(struct in_addr),AF_INET); + if (hp) + strncpy(host, hp->h_name, len); + else +- strncpy(host, host_address(inremote), len); ++ strncpy(host, inet_ntoa(inremote), len); + + host[len] = '\0'; + } +@@ -91,16 +77,7 @@ + if (noidentify) + return NULL; + else +- if (timeout) +- { +- if (rtimeout) +- return auth_tcpuser4(inlocal, inremote, local, remote, timeout, +- rtimeout); +- else +- return auth_tcpuser3(inlocal, inremote, local, remote, timeout); +- } +- else +- return auth_tcpuser2(inlocal, inremote, local, remote); ++ return ident_id(fd,timeout); + } + + +@@ -128,10 +105,6 @@ + timeout = atoi(argv[i]+2); + break; + +- case 'T': +- rtimeout = atoi(argv[i]+2); +- break; +- + case 'R': + if (!argv[i][2]) + reject_flag = 1; +@@ -200,7 +173,7 @@ + { + /* In child, let's fork again so we can forget about this child */ + if (fork()) +- _exit(); ++ _exit(0); + } + else + { +@@ -241,13 +214,13 @@ + } + } + +- if ((bits && (inremote >> bits != inlocal >> bits)) || ++ if ((bits && (htonl(inremote.s_addr) >> bits != htonl(inlocal.s_addr) >> bits)) || + (reject_flag && !id)) + { + if (id) +- syslog(priority, "Rejecting from %s@%s", id, host_address(inremote)); ++ syslog(priority, "Rejecting from %s@%s", id, inet_ntoa(inremote)); + else +- syslog(priority, "Rejecting from %s", host_address(inremote)); ++ syslog(priority, "Rejecting from %s", inet_ntoa(inremote)); + exit(1); + } + Property changes on: head/security/identify/files/patch-identify.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/keynote/files/patch-ac =================================================================== --- head/security/keynote/files/patch-ac (revision 363327) +++ head/security/keynote/files/patch-ac (nonexistent) @@ -1,23 +0,0 @@ ---- Makefile.in.orig Mon Nov 29 11:36:21 1999 -+++ Makefile.in Fri Mar 24 19:22:32 2000 -@@ -41,7 +41,7 @@ - YACCFLAGS = -d -p kn -b k - LEXFLAGS2 = -Pkv -s -i - LEXFLAGS = -Cr -Pkn -s -i --CFLAGS = -O2 -Wall # -g -+CFLAGS ?= -O2 -Wall # -g - RMFLAGS2 = -rf - RMFLAGS = -f - NROFFFLAGS = -mandoc -@@ -87,9 +87,11 @@ - - k.tab.c: keynote.y header.h keynote.h assertion.h config.h - $(YACC) $(YACCFLAGS) keynote.y -+k.tab.h: | k.tab.c - - z.tab.c: keynote-ver.y keynote.h header.h config.h - $(YACC) $(YACCFLAGS2) keynote-ver.y -+z.tab.h: | z.tab.c - - lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h - $(LEX) $(LEXFLAGS) keynote.l Property changes on: head/security/keynote/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/keynote/files/patch-ad =================================================================== --- head/security/keynote/files/patch-ad (revision 363327) +++ head/security/keynote/files/patch-ad (nonexistent) @@ -1,21 +0,0 @@ ---- configure.orig Wed Oct 20 22:04:39 1999 -+++ configure Fri Mar 24 19:38:46 2000 -@@ -1256,7 +1256,7 @@ - fi - - --LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\ -+LIBS="-L/usr/lib -L/usr/local/lib -L${OPENSSLLIB} -L/usr/ssl/lib -L/usr/openssl/lib\ - -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib" - - echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -@@ -1421,7 +1421,8 @@ - - - CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\ -- -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\ -+ -I/usr/local/ssl/include -I${OPENSSLINC}\ -+ -I/usr/openssl/include -I/usr/pkg/include\ - -I/usr/local/openssl/include -I/pkg/include" - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 Property changes on: head/security/keynote/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/keynote/files/patch-ae =================================================================== --- head/security/keynote/files/patch-ae (revision 363327) +++ head/security/keynote/files/patch-ae (nonexistent) @@ -1,11 +0,0 @@ ---- man/keynote.4.orig Tue Sep 26 16:16:32 2000 -+++ man/keynote.4 Sat Dec 1 01:52:33 2001 -@@ -20,7 +20,7 @@ - .\" PURPOSE. - .\" - .Dd May 22, 1999 --.Dt KEYNOTE 4 -+.Dt KEYNOTE 5 - .\" .TH KeyNote 4 local - .Os - .Sh NAME Property changes on: head/security/keynote/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/keynote/files/patch-af =================================================================== --- head/security/keynote/files/patch-af (revision 363327) +++ head/security/keynote/files/patch-af (nonexistent) @@ -1,164 +0,0 @@ ---- keynote-orig.y Wed Jun 14 08:28:23 2000 -+++ keynote.y Wed May 28 14:47:32 2003 -@@ -90,17 +90,17 @@ - | PRIVATEKEY { keynote_exceptionflag = keynote_donteval = 0; } - STRING { keynote_lex_remove($3); - keynote_privkey = $3; -- } -+ }; - - keypredicate: /* Nothing */ { keynote_returnvalue = 0; - return 0; - } - | notemptykeypredicate { keynote_returnvalue = $1; - return 0; -- } -+ }; - - notemptykeypredicate: key { $$ = $1; } -- | keyexp { $$ = $1; } -+ | keyexp { $$ = $1; }; - - keyexp: notemptykeypredicate AND { if (($1 == 0) && !keynote_justrecord) - keynote_donteval = 1; -@@ -137,7 +137,7 @@ - $$ = get_kth($1); - else - $$ = 0; -- } /* K-th */ -+ }; /* K-th */ - - keylist: key - { /* Don't do anything if we're just recording */ -@@ -154,7 +154,7 @@ - keynote_kth_array[$1]++; - - keylistcount++; -- } -+ }; - - key: str { - if (keynote_donteval) -@@ -192,10 +192,10 @@ - break; - } - } -- } -+ }; - - localinit: /* Nothing */ -- | localconstants -+ | localconstants; - - localconstants: VARIABLE EQQ STRING - { -@@ -264,12 +264,12 @@ - - if (i != RESULT_TRUE) - return -1; -- } localconstants -+ } localconstants ; - - program: prog { - keynote_returnvalue = $1; - return 0; -- } -+ }; - - prog: /* Nada */ { $$ = 0; } - | notemptyprog { -@@ -284,7 +284,7 @@ - $$ = $1; - else - $$ = $4; -- } -+ }; - - notemptyprog: expr HINT afterhint - { -@@ -299,7 +299,7 @@ - $$ = keynote_current_session->ks_values_num - 1; - else - $$ = 0; -- } -+ }; - - afterhint: str { if (keynote_exceptionflag || keynote_donteval) - $$ = 0; -@@ -314,7 +314,7 @@ - free($1); - } - } -- | OPENBLOCK prog CLOSEBLOCK { $$ = $2; } -+ | OPENBLOCK prog CLOSEBLOCK { $$ = $2; }; - - - expr: OPENPAREN expr CLOSEPAREN { $$ = $2; } -@@ -333,19 +333,19 @@ - | floatexp { $$ = $1; } - | stringexp { $$ = $1; } - | TRUE { $$ = 1; } -- | FALSE { $$ = 0; } -+ | FALSE { $$ = 0; }; - - numexp: numex LT numex { $$ = $1 < $3; } - | numex GT numex { $$ = $1 > $3; } - | numex EQ numex { $$ = $1 == $3; } - | numex LE numex { $$ = $1 <= $3; } - | numex GE numex { $$ = $1 >= $3; } -- | numex NE numex { $$ = $1 != $3; } -+ | numex NE numex { $$ = $1 != $3; }; - - floatexp: floatex LT floatex { $$ = $1 < $3; } - | floatex GT floatex { $$ = $1 > $3; } - | floatex LE floatex { $$ = $1 <= $3; } -- | floatex GE floatex { $$ = $1 >= $3; } -+ | floatex GE floatex { $$ = $1 >= $3; }; - - numex: numex PLUS numex { $$ = $1 + $3; } - | numex MINUS numex { $$ = $1 - $3; } -@@ -383,7 +383,7 @@ - $$ = (int) floor(atof($2)); - free($2); - } -- } -+ }; - - floatex: floatex PLUS floatex { $$ = ($1 + $3); } - | floatex MINUS floatex { $$ = ($1 - $3); } -@@ -417,7 +417,7 @@ - $$ = atof($2); - free($2); - } -- } -+ }; - - stringexp: str EQ str { - if (keynote_exceptionflag || keynote_donteval) -@@ -578,7 +578,7 @@ - free($1); - } - } -- } -+ }; - - str: str DOTT str { if (keynote_exceptionflag || keynote_donteval) - $$ = (char *) NULL; -@@ -604,7 +604,7 @@ - return -1; - } - } -- | strnotconcat { $$ = $1; } -+ | strnotconcat { $$ = $1; }; - - strnotconcat: STRING { $$ = $1; } - | OPENPAREN str CLOSEPAREN { $$ = $2; } -@@ -659,7 +659,7 @@ - if (keynote_lex_add($$, LEXTYPE_CHAR) == -1) - return -1; - } -- } -+ }; - %% - - /* Property changes on: head/security/keynote/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/keynote/files/patch-ag =================================================================== --- head/security/keynote/files/patch-ag (revision 363327) +++ head/security/keynote/files/patch-ag (nonexistent) @@ -1,20 +0,0 @@ ---- keynote-ver-orig.y Tue Oct 12 00:34:29 1999 -+++ keynote-ver.y Wed May 28 14:47:32 2003 -@@ -48,7 +48,7 @@ - | STRING { if (kn_add_authorizer(sessid, $1) != 0) - return keynote_errno; - free($1); -- } -+ }; - - expr: VSTRING EQ STRING { int i = kn_add_action(sessid, $1, $3, 0); - -@@ -63,7 +63,7 @@ - return i; - free($1); - free($3); -- } expr -+ } expr ; - %% - void - kverror(char *s) Property changes on: head/security/keynote/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/keynote/files/patch-Makefile.in =================================================================== --- head/security/keynote/files/patch-Makefile.in (nonexistent) +++ head/security/keynote/files/patch-Makefile.in (revision 363328) @@ -0,0 +1,23 @@ +--- Makefile.in.orig Mon Nov 29 11:36:21 1999 ++++ Makefile.in Fri Mar 24 19:22:32 2000 +@@ -41,7 +41,7 @@ + YACCFLAGS = -d -p kn -b k + LEXFLAGS2 = -Pkv -s -i + LEXFLAGS = -Cr -Pkn -s -i +-CFLAGS = -O2 -Wall # -g ++CFLAGS ?= -O2 -Wall # -g + RMFLAGS2 = -rf + RMFLAGS = -f + NROFFFLAGS = -mandoc +@@ -87,9 +87,11 @@ + + k.tab.c: keynote.y header.h keynote.h assertion.h config.h + $(YACC) $(YACCFLAGS) keynote.y ++k.tab.h: | k.tab.c + + z.tab.c: keynote-ver.y keynote.h header.h config.h + $(YACC) $(YACCFLAGS2) keynote-ver.y ++z.tab.h: | z.tab.c + + lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h + $(LEX) $(LEXFLAGS) keynote.l Property changes on: head/security/keynote/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/keynote/files/patch-configure =================================================================== --- head/security/keynote/files/patch-configure (nonexistent) +++ head/security/keynote/files/patch-configure (revision 363328) @@ -0,0 +1,21 @@ +--- configure.orig Wed Oct 20 22:04:39 1999 ++++ configure Fri Mar 24 19:38:46 2000 +@@ -1256,7 +1256,7 @@ + fi + + +-LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\ ++LIBS="-L/usr/lib -L/usr/local/lib -L${OPENSSLLIB} -L/usr/ssl/lib -L/usr/openssl/lib\ + -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib" + + echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 +@@ -1421,7 +1421,8 @@ + + + CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\ +- -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\ ++ -I/usr/local/ssl/include -I${OPENSSLINC}\ ++ -I/usr/openssl/include -I/usr/pkg/include\ + -I/usr/local/openssl/include -I/pkg/include" + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 Property changes on: head/security/keynote/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/keynote/files/patch-keynote-ver.y =================================================================== --- head/security/keynote/files/patch-keynote-ver.y (nonexistent) +++ head/security/keynote/files/patch-keynote-ver.y (revision 363328) @@ -0,0 +1,20 @@ +--- keynote-ver-orig.y Tue Oct 12 00:34:29 1999 ++++ keynote-ver.y Wed May 28 14:47:32 2003 +@@ -48,7 +48,7 @@ + | STRING { if (kn_add_authorizer(sessid, $1) != 0) + return keynote_errno; + free($1); +- } ++ }; + + expr: VSTRING EQ STRING { int i = kn_add_action(sessid, $1, $3, 0); + +@@ -63,7 +63,7 @@ + return i; + free($1); + free($3); +- } expr ++ } expr ; + %% + void + kverror(char *s) Property changes on: head/security/keynote/files/patch-keynote-ver.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/keynote/files/patch-keynote.y =================================================================== --- head/security/keynote/files/patch-keynote.y (nonexistent) +++ head/security/keynote/files/patch-keynote.y (revision 363328) @@ -0,0 +1,164 @@ +--- keynote-orig.y Wed Jun 14 08:28:23 2000 ++++ keynote.y Wed May 28 14:47:32 2003 +@@ -90,17 +90,17 @@ + | PRIVATEKEY { keynote_exceptionflag = keynote_donteval = 0; } + STRING { keynote_lex_remove($3); + keynote_privkey = $3; +- } ++ }; + + keypredicate: /* Nothing */ { keynote_returnvalue = 0; + return 0; + } + | notemptykeypredicate { keynote_returnvalue = $1; + return 0; +- } ++ }; + + notemptykeypredicate: key { $$ = $1; } +- | keyexp { $$ = $1; } ++ | keyexp { $$ = $1; }; + + keyexp: notemptykeypredicate AND { if (($1 == 0) && !keynote_justrecord) + keynote_donteval = 1; +@@ -137,7 +137,7 @@ + $$ = get_kth($1); + else + $$ = 0; +- } /* K-th */ ++ }; /* K-th */ + + keylist: key + { /* Don't do anything if we're just recording */ +@@ -154,7 +154,7 @@ + keynote_kth_array[$1]++; + + keylistcount++; +- } ++ }; + + key: str { + if (keynote_donteval) +@@ -192,10 +192,10 @@ + break; + } + } +- } ++ }; + + localinit: /* Nothing */ +- | localconstants ++ | localconstants; + + localconstants: VARIABLE EQQ STRING + { +@@ -264,12 +264,12 @@ + + if (i != RESULT_TRUE) + return -1; +- } localconstants ++ } localconstants ; + + program: prog { + keynote_returnvalue = $1; + return 0; +- } ++ }; + + prog: /* Nada */ { $$ = 0; } + | notemptyprog { +@@ -284,7 +284,7 @@ + $$ = $1; + else + $$ = $4; +- } ++ }; + + notemptyprog: expr HINT afterhint + { +@@ -299,7 +299,7 @@ + $$ = keynote_current_session->ks_values_num - 1; + else + $$ = 0; +- } ++ }; + + afterhint: str { if (keynote_exceptionflag || keynote_donteval) + $$ = 0; +@@ -314,7 +314,7 @@ + free($1); + } + } +- | OPENBLOCK prog CLOSEBLOCK { $$ = $2; } ++ | OPENBLOCK prog CLOSEBLOCK { $$ = $2; }; + + + expr: OPENPAREN expr CLOSEPAREN { $$ = $2; } +@@ -333,19 +333,19 @@ + | floatexp { $$ = $1; } + | stringexp { $$ = $1; } + | TRUE { $$ = 1; } +- | FALSE { $$ = 0; } ++ | FALSE { $$ = 0; }; + + numexp: numex LT numex { $$ = $1 < $3; } + | numex GT numex { $$ = $1 > $3; } + | numex EQ numex { $$ = $1 == $3; } + | numex LE numex { $$ = $1 <= $3; } + | numex GE numex { $$ = $1 >= $3; } +- | numex NE numex { $$ = $1 != $3; } ++ | numex NE numex { $$ = $1 != $3; }; + + floatexp: floatex LT floatex { $$ = $1 < $3; } + | floatex GT floatex { $$ = $1 > $3; } + | floatex LE floatex { $$ = $1 <= $3; } +- | floatex GE floatex { $$ = $1 >= $3; } ++ | floatex GE floatex { $$ = $1 >= $3; }; + + numex: numex PLUS numex { $$ = $1 + $3; } + | numex MINUS numex { $$ = $1 - $3; } +@@ -383,7 +383,7 @@ + $$ = (int) floor(atof($2)); + free($2); + } +- } ++ }; + + floatex: floatex PLUS floatex { $$ = ($1 + $3); } + | floatex MINUS floatex { $$ = ($1 - $3); } +@@ -417,7 +417,7 @@ + $$ = atof($2); + free($2); + } +- } ++ }; + + stringexp: str EQ str { + if (keynote_exceptionflag || keynote_donteval) +@@ -578,7 +578,7 @@ + free($1); + } + } +- } ++ }; + + str: str DOTT str { if (keynote_exceptionflag || keynote_donteval) + $$ = (char *) NULL; +@@ -604,7 +604,7 @@ + return -1; + } + } +- | strnotconcat { $$ = $1; } ++ | strnotconcat { $$ = $1; }; + + strnotconcat: STRING { $$ = $1; } + | OPENPAREN str CLOSEPAREN { $$ = $2; } +@@ -659,7 +659,7 @@ + if (keynote_lex_add($$, LEXTYPE_CHAR) == -1) + return -1; + } +- } ++ }; + %% + + /* Property changes on: head/security/keynote/files/patch-keynote.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/keynote/files/patch-man__keynote.4 =================================================================== --- head/security/keynote/files/patch-man__keynote.4 (nonexistent) +++ head/security/keynote/files/patch-man__keynote.4 (revision 363328) @@ -0,0 +1,11 @@ +--- man/keynote.4.orig Tue Sep 26 16:16:32 2000 ++++ man/keynote.4 Sat Dec 1 01:52:33 2001 +@@ -20,7 +20,7 @@ + .\" PURPOSE. + .\" + .Dd May 22, 1999 +-.Dt KEYNOTE 4 ++.Dt KEYNOTE 5 + .\" .TH KeyNote 4 local + .Os + .Sh NAME Property changes on: head/security/keynote/files/patch-man__keynote.4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5/files/patch-config::pre.in =================================================================== --- head/security/krb5/files/patch-config::pre.in (revision 363327) +++ head/security/krb5/files/patch-config::pre.in (nonexistent) @@ -1,11 +0,0 @@ ---- config/pre.in.orig Fri Nov 19 13:47:51 2004 -+++ config/pre.in Thu Jan 27 17:43:12 2005 -@@ -177,7 +177,7 @@ - INSTALL=@INSTALL@ - INSTALL_STRIP= - INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) --INSTALL_SCRIPT=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - INSTALL_SHLIB=@INSTALL_SHLIB@ - INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root Property changes on: head/security/krb5/files/patch-config::pre.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5/files/patch-av =================================================================== --- head/security/krb5/files/patch-av (revision 363327) +++ head/security/krb5/files/patch-av (nonexistent) @@ -1,18 +0,0 @@ ---- clients/ksu/Makefile.in.orig 2014-01-15 16:44:15.000000000 -0800 -+++ clients/ksu/Makefile.in 2014-05-05 20:51:51.925985974 -0700 -@@ -1,6 +1,6 @@ - mydir=clients$(S)ksu - BUILDTOP=$(REL)..$(S).. --DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' -+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG - - KSU_LIBS=@KSU_LIBS@ - -@@ -30,6 +30,6 @@ - - install:: - -for f in ksu; do \ -- $(INSTALL_SETUID) $$f \ -+ $(INSTALL_PROGRAM) $$f \ - $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ - done Property changes on: head/security/krb5/files/patch-av ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c =================================================================== --- head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c (revision 363327) +++ head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c (nonexistent) @@ -1,14 +0,0 @@ ---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 -+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 -@@ -33,6 +33,11 @@ - #endif - #endif - -+#include -+#if __FreeBSD_version < 500100 -+#include -+#endif -+ - #ifdef HAVE_STRING_H - #include - #else Property changes on: head/security/krb5/files/patch-lib::gssapi::krb5::import_name.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5/files/patch-config::shlib.conf =================================================================== --- head/security/krb5/files/patch-config::shlib.conf (revision 363327) +++ head/security/krb5/files/patch-config::shlib.conf (nonexistent) @@ -1,19 +0,0 @@ ---- config/shlib.conf.orig 2013-12-10 14:49:15.000000000 -0800 -+++ config/shlib.conf 2013-12-11 12:58:51.983110392 -0800 -@@ -315,13 +315,13 @@ - ;; - esac - SHLIBVEXT='.so.$(LIBMAJOR)' -- RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,' -+ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" -+ RPATH_FLAG='-Wl,-rpath -Wl,' - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' -- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)' -+ SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)' - SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' Property changes on: head/security/krb5/files/patch-config::shlib.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5/files/patch-clients__ksu__Makefile.in =================================================================== --- head/security/krb5/files/patch-clients__ksu__Makefile.in (nonexistent) +++ head/security/krb5/files/patch-clients__ksu__Makefile.in (revision 363328) @@ -0,0 +1,18 @@ +--- clients/ksu/Makefile.in.orig 2014-01-15 16:44:15.000000000 -0800 ++++ clients/ksu/Makefile.in 2014-05-05 20:51:51.925985974 -0700 +@@ -1,6 +1,6 @@ + mydir=clients$(S)ksu + BUILDTOP=$(REL)..$(S).. +-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' ++DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG + + KSU_LIBS=@KSU_LIBS@ + +@@ -30,6 +30,6 @@ + + install:: + -for f in ksu; do \ +- $(INSTALL_SETUID) $$f \ ++ $(INSTALL_PROGRAM) $$f \ + $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ + done Property changes on: head/security/krb5/files/patch-clients__ksu__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5/files/patch-config__pre.in =================================================================== --- head/security/krb5/files/patch-config__pre.in (nonexistent) +++ head/security/krb5/files/patch-config__pre.in (revision 363328) @@ -0,0 +1,11 @@ +--- config/pre.in.orig Fri Nov 19 13:47:51 2004 ++++ config/pre.in Thu Jan 27 17:43:12 2005 +@@ -177,7 +177,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) +-INSTALL_SCRIPT=@INSTALL_PROGRAM@ ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root Property changes on: head/security/krb5/files/patch-config__pre.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5/files/patch-config__shlib.conf =================================================================== --- head/security/krb5/files/patch-config__shlib.conf (nonexistent) +++ head/security/krb5/files/patch-config__shlib.conf (revision 363328) @@ -0,0 +1,19 @@ +--- config/shlib.conf.orig 2013-12-10 14:49:15.000000000 -0800 ++++ config/shlib.conf 2013-12-11 12:58:51.983110392 -0800 +@@ -315,13 +315,13 @@ + ;; + esac + SHLIBVEXT='.so.$(LIBMAJOR)' +- RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,' ++ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" ++ RPATH_FLAG='-Wl,-rpath -Wl,' + PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' + SHLIBEXT=.so +- LDCOMBINE='ld -Bshareable' +- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)' ++ SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' Property changes on: head/security/krb5/files/patch-config__shlib.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5/files/patch-lib__gssapi__krb5__import_name.c =================================================================== --- head/security/krb5/files/patch-lib__gssapi__krb5__import_name.c (nonexistent) +++ head/security/krb5/files/patch-lib__gssapi__krb5__import_name.c (revision 363328) @@ -0,0 +1,14 @@ +--- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 ++++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 +@@ -33,6 +33,11 @@ + #endif + #endif + ++#include ++#if __FreeBSD_version < 500100 ++#include ++#endif ++ + #ifdef HAVE_STRING_H + #include + #else Property changes on: head/security/krb5/files/patch-lib__gssapi__krb5__import_name.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-ay =================================================================== --- head/security/krb5-appl/files/patch-ay (revision 363327) +++ head/security/krb5-appl/files/patch-ay (nonexistent) @@ -1,50 +0,0 @@ ---- libpty/getpty.c.orig 2009-11-05 12:15:06.000000000 -0800 -+++ libpty/getpty.c 2010-04-21 21:36:45.637180364 -0700 -@@ -23,13 +23,26 @@ - #include "pty-int.h" - #include - -+#ifdef __FreeBSD__ -+#define PTYCHARS1 "pqrsPQRS" -+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv" -+#endif -+ -+#ifndef PTYCHARS1 -+#define PTYCHARS1 "pqrstuvwxyzPQRST" -+#endif -+ -+#ifndef PTYCHARS2 -+#define PTYCHARS2 "0123456789abcdef" -+#endif -+ - long - ptyint_getpty_ext(int *fd, char *slave, size_t slavelength, int do_grantpt) - { -+ int ptynum; -+ char *cp1, *cp2; - #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY) -- char *cp; - char *p; -- int i,ptynum; - struct stat stb; - char slavebuf[1024]; - #endif -@@ -112,14 +125,14 @@ - strncpy(slave, slavebuf, slavelength); - return 0; - } else { -- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) { -+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) { - snprintf(slavebuf,sizeof(slavebuf),"/dev/ptyXX"); -- slavebuf[sizeof("/dev/pty") - 1] = *cp; -+ slavebuf[sizeof("/dev/pty") - 1] = *cp1; - slavebuf[sizeof("/dev/ptyp") - 1] = '0'; - if (stat(slavebuf, &stb) < 0) - break; -- for (i = 0; i < 16; i++) { -- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i]; -+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) { -+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2; - *fd = open(slavebuf, O_RDWR); - if (*fd < 0) continue; - Property changes on: head/security/krb5-appl/files/patch-ay ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-aj =================================================================== --- head/security/krb5-appl/files/patch-aj (revision 363327) +++ head/security/krb5-appl/files/patch-aj (nonexistent) @@ -1,19 +0,0 @@ -*** gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 ---- gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 -*************** -*** 66,72 **** - struct stat buf; - time_t time(); - -! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0) - return; - if (fstat(fd, &buf) == 0) { - (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); ---- 66,72 ---- - struct stat buf; - time_t time(); - -! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) - return; - if (fstat(fd, &buf) == 0) { - (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); Property changes on: head/security/krb5-appl/files/patch-aj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-ai =================================================================== --- head/security/krb5-appl/files/patch-ai (revision 363327) +++ head/security/krb5-appl/files/patch-ai (nonexistent) @@ -1,17 +0,0 @@ ---- gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002 -+++ gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002 -@@ -487,7 +487,13 @@ - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); -+ -+#ifndef LOG_FTP -+#define FACILITY LOG_DAEMON -+#else -+#define FACILITY LOG_FTP -+#endif -+ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { Property changes on: head/security/krb5-appl/files/patch-ai ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-bb =================================================================== --- head/security/krb5-appl/files/patch-bb (revision 363327) +++ head/security/krb5-appl/files/patch-bb (nonexistent) @@ -1,10 +0,0 @@ ---- telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999 -+++ telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999 -@@ -58,7 +58,6 @@ - $(INSTALL_DATA) $(srcdir)/$$f.1 \ - ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \ - done -- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc - - authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) - commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) Property changes on: head/security/krb5-appl/files/patch-bb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-ba =================================================================== --- head/security/krb5-appl/files/patch-ba (revision 363327) +++ head/security/krb5-appl/files/patch-ba (nonexistent) @@ -1,120 +0,0 @@ ---- bsd/login.c.orig 2009-11-21 12:29:19.000000000 -0800 -+++ bsd/login.c 2011-08-31 21:56:02.581035877 -0700 -@@ -86,7 +86,12 @@ - #include - - #include -+#ifdef HAVE_UTMP_H - #include -+#endif -+#ifdef HAVE_UTMPX_H -+#include -+#endif - #include - - #include -@@ -225,8 +230,13 @@ - #endif - #ifndef UT_NAMESIZE - /* linux defines it directly in */ -+#ifdef HAVE_UTMP_H - #define UT_NAMESIZE sizeof(((struct utmp *)0)->ut_name) - #endif -+#ifdef HAVE_UTMPX_H -+#define UT_NAMESIZE sizeof(((struct utmpx *)0)->ut_user) -+#endif -+#endif - - #ifndef HAVE_SETPRIORITY - /* if we don't have it, punt it cleanly */ -@@ -964,19 +974,6 @@ - setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); - } - -- /* Policy: If local password is good, user is good. -- We really can't trust the Kerberos password, -- because somebody on the net could spoof the -- Kerberos server (not easy, but possible). -- Some sites might want to use it anyways, in -- which case they should change this line -- to: -- if (kpass_ok) -- */ -- -- if (lpass_ok) -- break; -- - if (got_v5_tickets) { - retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, - NULL, &xtra_creds, -@@ -993,6 +990,9 @@ - } - } - -+ if (lpass_ok) -+ break; -+ - bad_login: - setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); - -@@ -1250,21 +1250,23 @@ - /* set up credential cache -- obeying KRB5_ENV_CCNAME - set earlier */ - /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ -- if ((retval = krb5_cc_default(kcontext, &ccache))) { -+ if ((retval = krb5_cc_default(kcontext, &ccache))) - com_err(argv[0], retval, "while getting default ccache"); -- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { -- com_err(argv[0], retval, "when initializing cache"); -- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, -- &my_creds))) { -- com_err(argv[0], retval, "while storing credentials"); -- } else if (xtra_creds && -- (retval = krb5_cc_copy_creds(kcontext, xtra_creds, -- ccache))) { -- com_err(argv[0], retval, "while storing credentials"); -+ else { -+ if (retval = krb5_cc_initialize(kcontext, ccache, me)) -+ com_err(argv[0], retval, "when initializing cache"); -+ else { -+ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) -+ com_err(argv[0], retval, "while storing credentials"); -+ else { -+ if (xtra_creds && -+ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { -+ com_err(argv[0], retval, "while storing credentials"); -+ krb5_cc_destroy(kcontext, xtra_creds); -+ } -+ } -+ } - } -- -- if (xtra_creds) -- krb5_cc_destroy(kcontext, xtra_creds); - } else if (forwarded_v5_tickets && rewrite_ccache) { - if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { - syslog(LOG_ERR, -@@ -1322,6 +1324,7 @@ - - if (ccname) - setenv("KRB5CCNAME", ccname, 1); -+ krb5_cc_set_default_name(kcontext, ccname); - - setenv("HOME", pwd->pw_dir, 1); - setenv("PATH", LPATH, 0); -@@ -1652,6 +1655,7 @@ - int quiet; - char *tty; - { -+#if !(defined(__FreeBSD_version)) || (defined(__FreeBSD_version) && (__FreeBSD_version <= 900007)) - #if defined(HAVE_LASTLOG_H) || (defined(BSD) && (BSD >= 199103)) - struct lastlog ll; - time_t lltime; -@@ -1692,6 +1696,7 @@ - (void)close(fd); - } - #endif -+#endif - } - - #undef UNKNOWN Property changes on: head/security/krb5-appl/files/patch-ba ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c =================================================================== --- head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c (revision 363327) +++ head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c (nonexistent) @@ -1,38 +0,0 @@ ---- telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002 -+++ telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002 -@@ -408,18 +408,25 @@ - int - netwrite(const char *buf, size_t len) - { -- size_t remain; -+ int remaining, copied; -+ -+ remaining = BUFSIZ - (nfrontp - netobuf); -+ while (len > 0) { -+ /* Free up enough space if the room is too low*/ -+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) { -+ netflush(); -+ remaining = BUFSIZ - (nfrontp - netobuf); -+ } - -- remain = sizeof(netobuf) - (nfrontp - netobuf); -- if (remain < len) { -- netflush(); -- remain = sizeof(netobuf) - (nfrontp - netobuf); -+ /* Copy out as much as will fit */ -+ copied = remaining > len ? len : remaining; -+ memmove(nfrontp, buf, copied); -+ nfrontp += copied; -+ len -= copied; -+ remaining -= copied; -+ buf += copied; - } -- if (remain < len) -- return 0; -- memcpy(nfrontp, buf, len); -- nfrontp += len; -- return len; -+ return copied; - } - - /* Property changes on: head/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::bsd::klogind.M =================================================================== --- head/security/krb5-appl/files/patch-appl::bsd::klogind.M (revision 363327) +++ head/security/krb5-appl/files/patch-appl::bsd::klogind.M (nonexistent) @@ -1,26 +0,0 @@ ---- bsd/klogind.M.orig 2008-12-15 12:29:01.000000000 -0800 -+++ bsd/klogind.M 2009-08-28 13:13:28.000000000 -0700 -@@ -13,7 +13,7 @@ - .B \-rcpPef - ] - [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] --[ \fB\-D\fP \fIport\fP ] -+[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] - .SH DESCRIPTION - .I Klogind - is the server for the -@@ -136,11 +136,9 @@ - .IP \fB\-M\ realm\fP - Set the Kerberos realm to use. - --.IP \fB\-L\ login\fP --Set the login program to use. This option only has an effect if --DO_NOT_USE_K_LOGIN was not defined when --.I klogind --was compiled. -+.IP \fB\-L\ loginpath\fP -+Specify pathname to an alternative login program. Default: /usr/bin/login. -+KRB5_HOME/sbin/login.krb5 may be specified. - - .IP \fB\-D\ port\fP - Run in standalone mode, listening on \fBport\fP. The daemon will exit Property changes on: head/security/krb5-appl/files/patch-appl::bsd::klogind.M ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 =================================================================== --- head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 (revision 363327) +++ head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 (nonexistent) @@ -1,22 +0,0 @@ ---- telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001 -+++ telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001 -@@ -43,7 +43,7 @@ - [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP] - [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP] - [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]] --[\fB\-debug\fP [\fIport\fP]] -+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP] - .SH DESCRIPTION - The - .B telnetd -@@ -221,6 +221,10 @@ - in response to a - .SM DO TIMING-MARK) - for kludge linemode support. -+.TP -+\fB\-L\fP \fIloginpath\fP -+Specify pathname to an alternative login program. Default: /usr/bin/login. -+KRB5_HOME/sbin/login.krb5 may be specified. - .TP - .B \-l - Specifies line mode. Tries to force clients to use line-at-a-time Property changes on: head/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h =================================================================== --- head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h (revision 363327) +++ head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h (nonexistent) @@ -1,23 +0,0 @@ ---- gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003 -+++ gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003 -@@ -33,6 +33,10 @@ - * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 - */ - -+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 -+#undef __BSD_VISIBLE -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -57,9 +61,7 @@ - typedef void (*sig_t)(int); - typedef void sigtype; - #else --#define sig_t my_sig_t - #define sigtype krb5_sigtype --typedef sigtype (*sig_t)(); - #endif - - /* Property changes on: head/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in =================================================================== --- head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in (revision 363327) +++ head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001 -+++ telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001 -@@ -24,7 +24,7 @@ - # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 - # - --AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\" - OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON - LOCALINCLUDES=-I.. -I$(srcdir)/.. - DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS) Property changes on: head/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl::bsd::Makefile.in =================================================================== --- head/security/krb5-appl/files/patch-appl::bsd::Makefile.in (revision 363327) +++ head/security/krb5-appl/files/patch-appl::bsd::Makefile.in (nonexistent) @@ -1,12 +0,0 @@ ---- bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 -+++ bsd/Makefile.in Mon Dec 31 21:52:45 2001 -@@ -31,8 +31,8 @@ - -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" - - DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ -- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ -+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ - -DHEIMDAL_FRIENDLY - - all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) - Property changes on: head/security/krb5-appl/files/patch-appl::bsd::Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__bsd__Makefile.in =================================================================== --- head/security/krb5-appl/files/patch-appl__bsd__Makefile.in (nonexistent) +++ head/security/krb5-appl/files/patch-appl__bsd__Makefile.in (revision 363328) @@ -0,0 +1,12 @@ +--- bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001 ++++ bsd/Makefile.in Mon Dec 31 21:52:45 2001 +@@ -31,8 +31,8 @@ + -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" + + DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ +- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ ++ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ + -DHEIMDAL_FRIENDLY + + all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP) + Property changes on: head/security/krb5-appl/files/patch-appl__bsd__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__bsd__klogind.M =================================================================== --- head/security/krb5-appl/files/patch-appl__bsd__klogind.M (nonexistent) +++ head/security/krb5-appl/files/patch-appl__bsd__klogind.M (revision 363328) @@ -0,0 +1,26 @@ +--- bsd/klogind.M.orig 2008-12-15 12:29:01.000000000 -0800 ++++ bsd/klogind.M 2009-08-28 13:13:28.000000000 -0700 +@@ -13,7 +13,7 @@ + .B \-rcpPef + ] + [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ] +-[ \fB\-D\fP \fIport\fP ] ++[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP] + .SH DESCRIPTION + .I Klogind + is the server for the +@@ -136,11 +136,9 @@ + .IP \fB\-M\ realm\fP + Set the Kerberos realm to use. + +-.IP \fB\-L\ login\fP +-Set the login program to use. This option only has an effect if +-DO_NOT_USE_K_LOGIN was not defined when +-.I klogind +-was compiled. ++.IP \fB\-L\ loginpath\fP ++Specify pathname to an alternative login program. Default: /usr/bin/login. ++KRB5_HOME/sbin/login.krb5 may be specified. + + .IP \fB\-D\ port\fP + Run in standalone mode, listening on \fBport\fP. The daemon will exit Property changes on: head/security/krb5-appl/files/patch-appl__bsd__klogind.M ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h =================================================================== --- head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h (nonexistent) +++ head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h (revision 363328) @@ -0,0 +1,23 @@ +--- gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003 ++++ gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003 +@@ -33,6 +33,10 @@ + * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90 + */ + ++#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000 ++#undef __BSD_VISIBLE ++#endif ++ + #ifdef _WIN32 + #include + #include +@@ -57,9 +61,7 @@ + typedef void (*sig_t)(int); + typedef void sigtype; + #else +-#define sig_t my_sig_t + #define sigtype krb5_sigtype +-typedef sigtype (*sig_t)(); + #endif + + /* Property changes on: head/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in =================================================================== --- head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in (nonexistent) +++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in (revision 363328) @@ -0,0 +1,11 @@ +--- telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001 ++++ telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001 +@@ -24,7 +24,7 @@ + # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91 + # + +-AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" ++AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\" + OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON + LOCALINCLUDES=-I.. -I$(srcdir)/.. + DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS) Property changes on: head/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 =================================================================== --- head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 (nonexistent) +++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 (revision 363328) @@ -0,0 +1,22 @@ +--- telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001 ++++ telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001 +@@ -43,7 +43,7 @@ + [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP] + [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP] + [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]] +-[\fB\-debug\fP [\fIport\fP]] ++[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP] + .SH DESCRIPTION + The + .B telnetd +@@ -221,6 +221,10 @@ + in response to a + .SM DO TIMING-MARK) + for kludge linemode support. ++.TP ++\fB\-L\fP \fIloginpath\fP ++Specify pathname to an alternative login program. Default: /usr/bin/login. ++KRB5_HOME/sbin/login.krb5 may be specified. + .TP + .B \-l + Specifies line mode. Tries to force clients to use line-at-a-time Property changes on: head/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c =================================================================== --- head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c (nonexistent) +++ head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c (revision 363328) @@ -0,0 +1,38 @@ +--- telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002 ++++ telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002 +@@ -408,18 +408,25 @@ + int + netwrite(const char *buf, size_t len) + { +- size_t remain; ++ int remaining, copied; ++ ++ remaining = BUFSIZ - (nfrontp - netobuf); ++ while (len > 0) { ++ /* Free up enough space if the room is too low*/ ++ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) { ++ netflush(); ++ remaining = BUFSIZ - (nfrontp - netobuf); ++ } + +- remain = sizeof(netobuf) - (nfrontp - netobuf); +- if (remain < len) { +- netflush(); +- remain = sizeof(netobuf) - (nfrontp - netobuf); ++ /* Copy out as much as will fit */ ++ copied = remaining > len ? len : remaining; ++ memmove(nfrontp, buf, copied); ++ nfrontp += copied; ++ len -= copied; ++ remaining -= copied; ++ buf += copied; + } +- if (remain < len) +- return 0; +- memcpy(nfrontp, buf, len); +- nfrontp += len; +- return len; ++ return copied; + } + + /* Property changes on: head/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-bsd__login.c =================================================================== --- head/security/krb5-appl/files/patch-bsd__login.c (nonexistent) +++ head/security/krb5-appl/files/patch-bsd__login.c (revision 363328) @@ -0,0 +1,120 @@ +--- bsd/login.c.orig 2009-11-21 12:29:19.000000000 -0800 ++++ bsd/login.c 2011-08-31 21:56:02.581035877 -0700 +@@ -86,7 +86,12 @@ + #include + + #include ++#ifdef HAVE_UTMP_H + #include ++#endif ++#ifdef HAVE_UTMPX_H ++#include ++#endif + #include + + #include +@@ -225,8 +230,13 @@ + #endif + #ifndef UT_NAMESIZE + /* linux defines it directly in */ ++#ifdef HAVE_UTMP_H + #define UT_NAMESIZE sizeof(((struct utmp *)0)->ut_name) + #endif ++#ifdef HAVE_UTMPX_H ++#define UT_NAMESIZE sizeof(((struct utmpx *)0)->ut_user) ++#endif ++#endif + + #ifndef HAVE_SETPRIORITY + /* if we don't have it, punt it cleanly */ +@@ -964,19 +974,6 @@ + setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); + } + +- /* Policy: If local password is good, user is good. +- We really can't trust the Kerberos password, +- because somebody on the net could spoof the +- Kerberos server (not easy, but possible). +- Some sites might want to use it anyways, in +- which case they should change this line +- to: +- if (kpass_ok) +- */ +- +- if (lpass_ok) +- break; +- + if (got_v5_tickets) { + retval = krb5_verify_init_creds(kcontext, &my_creds, NULL, + NULL, &xtra_creds, +@@ -993,6 +990,9 @@ + } + } + ++ if (lpass_ok) ++ break; ++ + bad_login: + setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); + +@@ -1250,21 +1250,23 @@ + /* set up credential cache -- obeying KRB5_ENV_CCNAME + set earlier */ + /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */ +- if ((retval = krb5_cc_default(kcontext, &ccache))) { ++ if ((retval = krb5_cc_default(kcontext, &ccache))) + com_err(argv[0], retval, "while getting default ccache"); +- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) { +- com_err(argv[0], retval, "when initializing cache"); +- } else if ((retval = krb5_cc_store_cred(kcontext, ccache, +- &my_creds))) { +- com_err(argv[0], retval, "while storing credentials"); +- } else if (xtra_creds && +- (retval = krb5_cc_copy_creds(kcontext, xtra_creds, +- ccache))) { +- com_err(argv[0], retval, "while storing credentials"); ++ else { ++ if (retval = krb5_cc_initialize(kcontext, ccache, me)) ++ com_err(argv[0], retval, "when initializing cache"); ++ else { ++ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds)) ++ com_err(argv[0], retval, "while storing credentials"); ++ else { ++ if (xtra_creds && ++ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) { ++ com_err(argv[0], retval, "while storing credentials"); ++ krb5_cc_destroy(kcontext, xtra_creds); ++ } ++ } ++ } + } +- +- if (xtra_creds) +- krb5_cc_destroy(kcontext, xtra_creds); + } else if (forwarded_v5_tickets && rewrite_ccache) { + if ((retval = krb5_cc_initialize (kcontext, ccache, me))) { + syslog(LOG_ERR, +@@ -1322,6 +1324,7 @@ + + if (ccname) + setenv("KRB5CCNAME", ccname, 1); ++ krb5_cc_set_default_name(kcontext, ccname); + + setenv("HOME", pwd->pw_dir, 1); + setenv("PATH", LPATH, 0); +@@ -1652,6 +1655,7 @@ + int quiet; + char *tty; + { ++#if !(defined(__FreeBSD_version)) || (defined(__FreeBSD_version) && (__FreeBSD_version <= 900007)) + #if defined(HAVE_LASTLOG_H) || (defined(BSD) && (BSD >= 199103)) + struct lastlog ll; + time_t lltime; +@@ -1692,6 +1696,7 @@ + (void)close(fd); + } + #endif ++#endif + } + + #undef UNKNOWN Property changes on: head/security/krb5-appl/files/patch-bsd__login.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c =================================================================== --- head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c (nonexistent) +++ head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c (revision 363328) @@ -0,0 +1,17 @@ +--- gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002 ++++ gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002 +@@ -487,7 +487,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { Property changes on: head/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c =================================================================== --- head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c (nonexistent) +++ head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c (revision 363328) @@ -0,0 +1,19 @@ +*** gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 +--- gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 +*************** +*** 66,72 **** + struct stat buf; + time_t time(); + +! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0) + return; + if (fstat(fd, &buf) == 0) { + (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); +--- 66,72 ---- + struct stat buf; + time_t time(); + +! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) + return; + if (fstat(fd, &buf) == 0) { + (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); Property changes on: head/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-libpty__getpty.c =================================================================== --- head/security/krb5-appl/files/patch-libpty__getpty.c (nonexistent) +++ head/security/krb5-appl/files/patch-libpty__getpty.c (revision 363328) @@ -0,0 +1,50 @@ +--- libpty/getpty.c.orig 2009-11-05 12:15:06.000000000 -0800 ++++ libpty/getpty.c 2010-04-21 21:36:45.637180364 -0700 +@@ -23,13 +23,26 @@ + #include "pty-int.h" + #include + ++#ifdef __FreeBSD__ ++#define PTYCHARS1 "pqrsPQRS" ++#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv" ++#endif ++ ++#ifndef PTYCHARS1 ++#define PTYCHARS1 "pqrstuvwxyzPQRST" ++#endif ++ ++#ifndef PTYCHARS2 ++#define PTYCHARS2 "0123456789abcdef" ++#endif ++ + long + ptyint_getpty_ext(int *fd, char *slave, size_t slavelength, int do_grantpt) + { ++ int ptynum; ++ char *cp1, *cp2; + #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY) +- char *cp; + char *p; +- int i,ptynum; + struct stat stb; + char slavebuf[1024]; + #endif +@@ -112,14 +125,14 @@ + strncpy(slave, slavebuf, slavelength); + return 0; + } else { +- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) { ++ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) { + snprintf(slavebuf,sizeof(slavebuf),"/dev/ptyXX"); +- slavebuf[sizeof("/dev/pty") - 1] = *cp; ++ slavebuf[sizeof("/dev/pty") - 1] = *cp1; + slavebuf[sizeof("/dev/ptyp") - 1] = '0'; + if (stat(slavebuf, &stb) < 0) + break; +- for (i = 0; i < 16; i++) { +- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i]; ++ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) { ++ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2; + *fd = open(slavebuf, O_RDWR); + if (*fd < 0) continue; + Property changes on: head/security/krb5-appl/files/patch-libpty__getpty.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in =================================================================== --- head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in (nonexistent) +++ head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in (revision 363328) @@ -0,0 +1,10 @@ +--- telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999 ++++ telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999 +@@ -58,7 +58,6 @@ + $(INSTALL_DATA) $(srcdir)/$$f.1 \ + ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \ + done +- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc + + authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) + commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) Property changes on: head/security/krb5-appl/files/patch-telnet__telnet__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-config::pre.in =================================================================== --- head/security/krb5-maint/files/patch-config::pre.in (revision 363327) +++ head/security/krb5-maint/files/patch-config::pre.in (nonexistent) @@ -1,11 +0,0 @@ ---- config/pre.in.orig Fri Nov 19 13:47:51 2004 -+++ config/pre.in Thu Jan 27 17:43:12 2005 -@@ -177,7 +177,7 @@ - INSTALL=@INSTALL@ - INSTALL_STRIP= - INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) --INSTALL_SCRIPT=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - INSTALL_SHLIB=@INSTALL_SHLIB@ - INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root Property changes on: head/security/krb5-maint/files/patch-config::pre.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-av =================================================================== --- head/security/krb5-maint/files/patch-av (revision 363327) +++ head/security/krb5-maint/files/patch-av (nonexistent) @@ -1,18 +0,0 @@ ---- clients/ksu/Makefile.in.orig 2014-01-21 14:11:14.000000000 -0800 -+++ clients/ksu/Makefile.in 2014-05-05 20:55:07.343860783 -0700 -@@ -1,6 +1,6 @@ - mydir=clients$(S)ksu - BUILDTOP=$(REL)..$(S).. --DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' -+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG - DEFS= - - PROG_LIBPATH=-L$(TOPLIBD) -@@ -34,6 +34,6 @@ - - install:: - -for f in ksu; do \ -- $(INSTALL_SETUID) $$f \ -+ $(INSTALL_PROGRAM) $$f \ - $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ - done Property changes on: head/security/krb5-maint/files/patch-av ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c =================================================================== --- head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c (revision 363327) +++ head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c (nonexistent) @@ -1,14 +0,0 @@ ---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 -+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 -@@ -33,6 +33,11 @@ - #endif - #endif - -+#include -+#if __FreeBSD_version < 500100 -+#include -+#endif -+ - #ifdef HAVE_STRING_H - #include - #else Property changes on: head/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-config::shlib.conf =================================================================== --- head/security/krb5-maint/files/patch-config::shlib.conf (revision 363327) +++ head/security/krb5-maint/files/patch-config::shlib.conf (nonexistent) @@ -1,33 +0,0 @@ ---- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700 -+++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700 -@@ -306,24 +306,18 @@ - ;; - - *-*-freebsd*) -- if test -x /usr/bin/objformat ; then -- objformat=`/usr/bin/objformat` -- else -- objformat="elf" -- fi -- PICFLAGS=-fpic -- if test "x$objformat" = "xelf" ; then -+ case $krb5_cv_host in -+ sparc64-*) PICFLAGS=-fPIC;; -+ *) PICFLAGS=-fpic;; -+ esac -+ - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" - RPATH_FLAG='-Wl,-rpath -Wl,' -- else -- RPATH_FLAG=-R -- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' -- fi - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' - SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' Property changes on: head/security/krb5-maint/files/patch-config::shlib.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-clients__ksu__Makefile.in =================================================================== --- head/security/krb5-maint/files/patch-clients__ksu__Makefile.in (nonexistent) +++ head/security/krb5-maint/files/patch-clients__ksu__Makefile.in (revision 363328) @@ -0,0 +1,18 @@ +--- clients/ksu/Makefile.in.orig 2014-01-21 14:11:14.000000000 -0800 ++++ clients/ksu/Makefile.in 2014-05-05 20:55:07.343860783 -0700 +@@ -1,6 +1,6 @@ + mydir=clients$(S)ksu + BUILDTOP=$(REL)..$(S).. +-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' ++DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG + DEFS= + + PROG_LIBPATH=-L$(TOPLIBD) +@@ -34,6 +34,6 @@ + + install:: + -for f in ksu; do \ +- $(INSTALL_SETUID) $$f \ ++ $(INSTALL_PROGRAM) $$f \ + $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ + done Property changes on: head/security/krb5-maint/files/patch-clients__ksu__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-config__pre.in =================================================================== --- head/security/krb5-maint/files/patch-config__pre.in (nonexistent) +++ head/security/krb5-maint/files/patch-config__pre.in (revision 363328) @@ -0,0 +1,11 @@ +--- config/pre.in.orig Fri Nov 19 13:47:51 2004 ++++ config/pre.in Thu Jan 27 17:43:12 2005 +@@ -177,7 +177,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) +-INSTALL_SCRIPT=@INSTALL_PROGRAM@ ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root Property changes on: head/security/krb5-maint/files/patch-config__pre.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-config__shlib.conf =================================================================== --- head/security/krb5-maint/files/patch-config__shlib.conf (nonexistent) +++ head/security/krb5-maint/files/patch-config__shlib.conf (revision 363328) @@ -0,0 +1,33 @@ +--- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700 ++++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700 +@@ -306,24 +306,18 @@ + ;; + + *-*-freebsd*) +- if test -x /usr/bin/objformat ; then +- objformat=`/usr/bin/objformat` +- else +- objformat="elf" +- fi +- PICFLAGS=-fpic +- if test "x$objformat" = "xelf" ; then ++ case $krb5_cv_host in ++ sparc64-*) PICFLAGS=-fPIC;; ++ *) PICFLAGS=-fpic;; ++ esac ++ + SHLIBVEXT='.so.$(LIBMAJOR)' ++ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" + RPATH_FLAG='-Wl,-rpath -Wl,' +- else +- RPATH_FLAG=-R +- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' +- fi + PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' + SHLIBEXT=.so +- LDCOMBINE='ld -Bshareable' + SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' Property changes on: head/security/krb5-maint/files/patch-config__shlib.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c =================================================================== --- head/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c (nonexistent) +++ head/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c (revision 363328) @@ -0,0 +1,14 @@ +--- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 ++++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 +@@ -33,6 +33,11 @@ + #endif + #endif + ++#include ++#if __FreeBSD_version < 500100 ++#include ++#endif ++ + #ifdef HAVE_STRING_H + #include + #else Property changes on: head/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-aa =================================================================== --- head/security/l0pht-watch/files/patch-aa (revision 363327) +++ head/security/l0pht-watch/files/patch-aa (nonexistent) @@ -1,28 +0,0 @@ ---- Makefile.orig Thu Sep 23 10:18:18 1999 -+++ Makefile Tue Apr 25 00:30:11 2000 -@@ -9,12 +9,13 @@ - # debugging - # DFLAGS = -DTEST -DDEBUG - DFLAGS = -DREGEX --CFLAGS =-O -Wall -+CFLAGS ?=-O -Wall - XFLAGS = # xtra cflags, set by systype targets - XLIBS = # xtra libs if necessary? - # -Bstatic for sunos, -static for gcc, etc. You want this, trust me. - STATIC = --CC = cc $(CFLAGS) -+CC ?= cc -+CC += $(CFLAGS) - LD = $(CC) -s # linker; defaults to stripped executables - o = o # object extension - CKTEMP_OBJS=check_tmp.o daemon.o list_utils.o usage.o -@@ -60,7 +61,8 @@ - - OpenBSD: - make -e $(ALL) $(MFLAGS) \ -- XFLAGS='-DBSD -DREGEX -DREGCOMP_3C' CC="gcc $(CFLAGS)" STATIC=-static -+ XFLAGS='-DREGEX -DREGCOMP_3C' CC="$(CC) $(CFLAGS)" \ -+ STATIC=-static - - generic: - make -e $(ALL) $(MFLAGS) \ Property changes on: head/security/l0pht-watch/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ab =================================================================== --- head/security/l0pht-watch/files/patch-ab (revision 363327) +++ head/security/l0pht-watch/files/patch-ab (nonexistent) @@ -1,74 +0,0 @@ ---- check_tmp.c.orig Fri Sep 24 15:33:35 1999 -+++ check_tmp.c Tue Jul 18 16:18:59 2000 -@@ -37,7 +37,13 @@ - char error_buffer[256]; - #endif - #endif -- -+ -+#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) -+ struct kevent ev; -+ int fd; -+ struct timespec ts = { 0, 0 }; -+ int kq = -1; -+#endif - - struct listStruct *list = NULL; - -@@ -178,6 +184,21 @@ - exit(1); - } - -+#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) -+ /* Set up the KQ on the target directory */ -+ fd = dirfd(dirp); -+ -+ kq = kqueue(); -+ if (kq < 0) -+ err(1, "kqueue"); -+ -+ ev.ident = fd; -+ ev.filter = EVFILT_VNODE; -+ ev.flags = EV_ADD | EV_ENABLE | EV_CLEAR; -+ ev.fflags = NOTE_WRITE; -+ kevent(kq, &ev, 1, NULL, 0, &ts); -+#endif -+ - /* steup the first element of the list */ - while ((dp = readdir(dirp)) != NULL){ - if (!list) /* first time */ -@@ -266,6 +287,10 @@ - rewinddir(dirp); - - while (1){ -+ -+#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) -+ if (ev.fflags & NOTE_WRITE) { -+#endif - while ((dp = readdir(dirp)) != NULL){ - if (!(checknode(list, watchdir, dp->d_name))){ - if (replacewatchflag){ -@@ -352,11 +377,22 @@ - /* closedir(dirp); */ - } - } --#ifdef 0 -+#if 0 - walklist(list); - #endif - list = prunelist(list); - rewinddir(dirp); -+ -+#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) -+ /* Reset event so we don't trigger on the rewinddir */ -+ kevent(kq, &ev, 1, NULL, 0, &ts); -+ -+ /* Block until the directory changes */ -+ if (kevent(kq, NULL, 0, &ev, 1, NULL) < 0) -+ err(1, "kevent"); -+ -+ } -+#endif - } - /* closedir(dirp); */ - Property changes on: head/security/l0pht-watch/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ac =================================================================== --- head/security/l0pht-watch/files/patch-ac (revision 363327) +++ head/security/l0pht-watch/files/patch-ac (nonexistent) @@ -1,31 +0,0 @@ ---- check_tmp.h.orig Thu Dec 24 10:40:13 1998 -+++ check_tmp.h Sun Aug 13 23:54:21 2000 -@@ -1,16 +1,23 @@ - #ifndef __CHECK_TMP_H - #define __CHECK_TMP_H - --#include --#include - #include -+#include - #include -+#include -+#include - #include --#include --#include - #include --#include -+#include -+#include -+#include -+#include - #include -+#if (__FreeBSD_version >= 500001) || (__FreeBSD_version >= 400019 && __FreeBSD_version < 500000) -+#include -+#include -+#include -+#endif - - #if defined (REGEXPR_3G) - #include Property changes on: head/security/l0pht-watch/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ad =================================================================== --- head/security/l0pht-watch/files/patch-ad (revision 363327) +++ head/security/l0pht-watch/files/patch-ad (nonexistent) @@ -1,42 +0,0 @@ ---- list_utils.c.orig Thu Dec 24 00:00:44 1998 -+++ list_utils.c Sun Aug 13 23:55:23 2000 -@@ -102,9 +102,11 @@ - char filemodes[11]; - char outputStr[(MAXNAMLEN * 2) + 256]; - char linkbuf[MAXNAMLEN + 1]; -+ struct winsize winsize; - struct passwd *pwent; - struct group *groupent; - int ret; -+ unsigned short width; - - switch(action){ - case ADDITION: -@@ -143,11 +145,16 @@ - - getfilemodes(&list->statbuf, filemodes); - -+ if (ioctl(1, TIOCGWINSZ, &winsize) == 0) -+ width = winsize.ws_col; -+ else -+ width = 80; -+ - sprintf(outputStr,"%.2s %-11.20s %-2d %-8.20s %-8.20s %-6ld %-10.20s " -- "%.20s", -+ "%.*s", - (action == ADDITION) ? "+ " : "- ", filemodes, - (int)list->statbuf.st_nlink, username, groupname, -- (long)list->statbuf.st_size, timehold, list->filename); -+ (long)list->statbuf.st_size, timehold, width - 60, list->filename); - - if (S_ISLNK(list->statbuf.st_mode) ){ - ret = readlink(list->filename, linkbuf, sizeof(linkbuf)); -@@ -168,7 +175,7 @@ - - - --#ifdef 0 -+#if 0 - printf("%-11s %-2d %-8s %-8s %-6ld %-10s %-10s\n", filemodes, - (int)list->statbuf.st_nlink, username, groupname, - list->statbuf.st_size, timehold, list->filename); Property changes on: head/security/l0pht-watch/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-Makefile =================================================================== --- head/security/l0pht-watch/files/patch-Makefile (nonexistent) +++ head/security/l0pht-watch/files/patch-Makefile (revision 363328) @@ -0,0 +1,28 @@ +--- Makefile.orig Thu Sep 23 10:18:18 1999 ++++ Makefile Tue Apr 25 00:30:11 2000 +@@ -9,12 +9,13 @@ + # debugging + # DFLAGS = -DTEST -DDEBUG + DFLAGS = -DREGEX +-CFLAGS =-O -Wall ++CFLAGS ?=-O -Wall + XFLAGS = # xtra cflags, set by systype targets + XLIBS = # xtra libs if necessary? + # -Bstatic for sunos, -static for gcc, etc. You want this, trust me. + STATIC = +-CC = cc $(CFLAGS) ++CC ?= cc ++CC += $(CFLAGS) + LD = $(CC) -s # linker; defaults to stripped executables + o = o # object extension + CKTEMP_OBJS=check_tmp.o daemon.o list_utils.o usage.o +@@ -60,7 +61,8 @@ + + OpenBSD: + make -e $(ALL) $(MFLAGS) \ +- XFLAGS='-DBSD -DREGEX -DREGCOMP_3C' CC="gcc $(CFLAGS)" STATIC=-static ++ XFLAGS='-DREGEX -DREGCOMP_3C' CC="$(CC) $(CFLAGS)" \ ++ STATIC=-static + + generic: + make -e $(ALL) $(MFLAGS) \ Property changes on: head/security/l0pht-watch/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-check_tmp.c =================================================================== --- head/security/l0pht-watch/files/patch-check_tmp.c (nonexistent) +++ head/security/l0pht-watch/files/patch-check_tmp.c (revision 363328) @@ -0,0 +1,74 @@ +--- check_tmp.c.orig Fri Sep 24 15:33:35 1999 ++++ check_tmp.c Tue Jul 18 16:18:59 2000 +@@ -37,7 +37,13 @@ + char error_buffer[256]; + #endif + #endif +- ++ ++#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) ++ struct kevent ev; ++ int fd; ++ struct timespec ts = { 0, 0 }; ++ int kq = -1; ++#endif + + struct listStruct *list = NULL; + +@@ -178,6 +184,21 @@ + exit(1); + } + ++#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) ++ /* Set up the KQ on the target directory */ ++ fd = dirfd(dirp); ++ ++ kq = kqueue(); ++ if (kq < 0) ++ err(1, "kqueue"); ++ ++ ev.ident = fd; ++ ev.filter = EVFILT_VNODE; ++ ev.flags = EV_ADD | EV_ENABLE | EV_CLEAR; ++ ev.fflags = NOTE_WRITE; ++ kevent(kq, &ev, 1, NULL, 0, &ts); ++#endif ++ + /* steup the first element of the list */ + while ((dp = readdir(dirp)) != NULL){ + if (!list) /* first time */ +@@ -266,6 +287,10 @@ + rewinddir(dirp); + + while (1){ ++ ++#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) ++ if (ev.fflags & NOTE_WRITE) { ++#endif + while ((dp = readdir(dirp)) != NULL){ + if (!(checknode(list, watchdir, dp->d_name))){ + if (replacewatchflag){ +@@ -352,11 +377,22 @@ + /* closedir(dirp); */ + } + } +-#ifdef 0 ++#if 0 + walklist(list); + #endif + list = prunelist(list); + rewinddir(dirp); ++ ++#if (__FreeBSD_version >= 500011) || (__FreeBSD_version >= 410000 && __FreeBSD_version < 500000) ++ /* Reset event so we don't trigger on the rewinddir */ ++ kevent(kq, &ev, 1, NULL, 0, &ts); ++ ++ /* Block until the directory changes */ ++ if (kevent(kq, NULL, 0, &ev, 1, NULL) < 0) ++ err(1, "kevent"); ++ ++ } ++#endif + } + /* closedir(dirp); */ + Property changes on: head/security/l0pht-watch/files/patch-check_tmp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-check_tmp.h =================================================================== --- head/security/l0pht-watch/files/patch-check_tmp.h (nonexistent) +++ head/security/l0pht-watch/files/patch-check_tmp.h (revision 363328) @@ -0,0 +1,31 @@ +--- check_tmp.h.orig Thu Dec 24 10:40:13 1998 ++++ check_tmp.h Sun Aug 13 23:54:21 2000 +@@ -1,16 +1,23 @@ + #ifndef __CHECK_TMP_H + #define __CHECK_TMP_H + +-#include +-#include + #include ++#include + #include ++#include ++#include + #include +-#include +-#include + #include +-#include ++#include ++#include ++#include ++#include + #include ++#if (__FreeBSD_version >= 500001) || (__FreeBSD_version >= 400019 && __FreeBSD_version < 500000) ++#include ++#include ++#include ++#endif + + #if defined (REGEXPR_3G) + #include Property changes on: head/security/l0pht-watch/files/patch-check_tmp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/l0pht-watch/files/patch-list_utils.c =================================================================== --- head/security/l0pht-watch/files/patch-list_utils.c (nonexistent) +++ head/security/l0pht-watch/files/patch-list_utils.c (revision 363328) @@ -0,0 +1,42 @@ +--- list_utils.c.orig Thu Dec 24 00:00:44 1998 ++++ list_utils.c Sun Aug 13 23:55:23 2000 +@@ -102,9 +102,11 @@ + char filemodes[11]; + char outputStr[(MAXNAMLEN * 2) + 256]; + char linkbuf[MAXNAMLEN + 1]; ++ struct winsize winsize; + struct passwd *pwent; + struct group *groupent; + int ret; ++ unsigned short width; + + switch(action){ + case ADDITION: +@@ -143,11 +145,16 @@ + + getfilemodes(&list->statbuf, filemodes); + ++ if (ioctl(1, TIOCGWINSZ, &winsize) == 0) ++ width = winsize.ws_col; ++ else ++ width = 80; ++ + sprintf(outputStr,"%.2s %-11.20s %-2d %-8.20s %-8.20s %-6ld %-10.20s " +- "%.20s", ++ "%.*s", + (action == ADDITION) ? "+ " : "- ", filemodes, + (int)list->statbuf.st_nlink, username, groupname, +- (long)list->statbuf.st_size, timehold, list->filename); ++ (long)list->statbuf.st_size, timehold, width - 60, list->filename); + + if (S_ISLNK(list->statbuf.st_mode) ){ + ret = readlink(list->filename, linkbuf, sizeof(linkbuf)); +@@ -168,7 +175,7 @@ + + + +-#ifdef 0 ++#if 0 + printf("%-11s %-2d %-8s %-8s %-6ld %-10s %-10s\n", filemodes, + (int)list->statbuf.st_nlink, username, groupname, + list->statbuf.st_size, timehold, list->filename); Property changes on: head/security/l0pht-watch/files/patch-list_utils.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/nessus/files/patch-aa =================================================================== --- head/security/nessus/files/patch-aa (revision 363327) +++ head/security/nessus/files/patch-aa (nonexistent) @@ -1,13 +0,0 @@ ---- nessus-mkcert-client.in.orig Thu Feb 28 18:03:45 2002 -+++ nessus-mkcert-client.in Wed May 29 13:12:17 2002 -@@ -84,8 +84,8 @@ - - - --NESSUSPRIV="$localstatedir/nessus/CA" --NESSUSPUB="$sharedstatedir/nessus/CA" -+NESSUSPRIV="$localstatedir/CA" -+NESSUSPUB="$sharedstatedir/CA" - - while [ ! -d "$NESSUSPRIV" ]; do - echo_no_nl "Nessus server 'private' directory: " Property changes on: head/security/nessus/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/nessus/files/patch-ab =================================================================== --- head/security/nessus/files/patch-ab (revision 363327) +++ head/security/nessus/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- nessus-mkcert.in.orig Fri Sep 14 13:09:12 2001 -+++ nessus-mkcert.in Mon Oct 8 13:25:14 2001 -@@ -64,8 +64,8 @@ - exit 1 - esac - --NESSUSPRIV="$localstatedir/nessus/CA" --NESSUSPUB="$sharedstatedir/nessus/CA" -+NESSUSPRIV="$localstatedir/CA" -+NESSUSPUB="$sharedstatedir/CA" - if [ ! -d "$NESSUSPRIV" ]; then - mkdir -p "$NESSUSPRIV" - chmod 700 "$NESSUSPRIV" Property changes on: head/security/nessus/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/nessus/files/patch-nessus-mkcert-client.in =================================================================== --- head/security/nessus/files/patch-nessus-mkcert-client.in (nonexistent) +++ head/security/nessus/files/patch-nessus-mkcert-client.in (revision 363328) @@ -0,0 +1,13 @@ +--- nessus-mkcert-client.in.orig Thu Feb 28 18:03:45 2002 ++++ nessus-mkcert-client.in Wed May 29 13:12:17 2002 +@@ -84,8 +84,8 @@ + + + +-NESSUSPRIV="$localstatedir/nessus/CA" +-NESSUSPUB="$sharedstatedir/nessus/CA" ++NESSUSPRIV="$localstatedir/CA" ++NESSUSPUB="$sharedstatedir/CA" + + while [ ! -d "$NESSUSPRIV" ]; do + echo_no_nl "Nessus server 'private' directory: " Property changes on: head/security/nessus/files/patch-nessus-mkcert-client.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/nessus/files/patch-nessus-mkcert.in =================================================================== --- head/security/nessus/files/patch-nessus-mkcert.in (nonexistent) +++ head/security/nessus/files/patch-nessus-mkcert.in (revision 363328) @@ -0,0 +1,13 @@ +--- nessus-mkcert.in.orig Fri Sep 14 13:09:12 2001 ++++ nessus-mkcert.in Mon Oct 8 13:25:14 2001 +@@ -64,8 +64,8 @@ + exit 1 + esac + +-NESSUSPRIV="$localstatedir/nessus/CA" +-NESSUSPUB="$sharedstatedir/nessus/CA" ++NESSUSPRIV="$localstatedir/CA" ++NESSUSPUB="$sharedstatedir/CA" + if [ ! -d "$NESSUSPRIV" ]; then + mkdir -p "$NESSUSPRIV" + chmod 700 "$NESSUSPRIV" Property changes on: head/security/nessus/files/patch-nessus-mkcert.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/nessus-libraries/files/patch-aa =================================================================== --- head/security/nessus-libraries/files/patch-aa (revision 363327) +++ head/security/nessus-libraries/files/patch-aa (nonexistent) @@ -1,85 +0,0 @@ ---- Makefile.orig 2004-01-09 00:55:13.000000000 +0800 -+++ Makefile 2013-07-28 16:41:08.000000000 +0800 -@@ -3,8 +3,8 @@ - ALLDEPS = nessus.tmpl nessus-config - - all: $(ALLDEPS) $(PCAP_MAKE) -- cd libnessus && ${MAKE} -- cd libhosts_gatherer && ${MAKE} -+ ${MAKE} -C libnessus -+ ${MAKE} -C libhosts_gatherer - - nessus-config: nessus-config.pre Makefile nessus.tmpl - @echo Creating $@ ... -@@ -19,8 +19,8 @@ - touch $@ - - win32: -- -cd libpcap-nessus && ${MAKE} distclean -- -cd libhosts_gatherer && ${MAKE} distclean -+ -${MAKE} -C libpcap-nessus distclean -+ -${MAKE} -C libhosts_gatherer distclean - @echo - @echo ' --------------------------------------------------------------' - @echo ' The header files necessary and some docs have been generated,' -@@ -31,27 +31,26 @@ - - - pcap-make : -- -cd libpcap-nessus && ${MAKE} -+ -${MAKE} -C libpcap-nessus - - pcap-install: - test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix} - test -d $(DESTDIR)${libdir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${libdir} -- -cd libpcap-nessus && ${MAKE} install -+ -${MAKE} -C libpcap-nessus install - - pcap-clean : -- -cd libpcap-nessus && ${MAKE} clean -+ -${MAKE} -C libpcap-nessus clean - - pcap-distclean: -- -cd libpcap-nessus && ${MAKE} distclean -+ -${MAKE} -C libpcap-nessus distclean - - install : $(PCAP_INSTALL) - test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix} - test -d $(DESTDIR)${includedir}/nessus || ${INSTALL_DIR} -m 755 $(DESTDIR)${includedir}/nessus -- cd libnessus && ${MAKE} install -- cd libhosts_gatherer && ${MAKE} install -+ ${MAKE} -C libnessus install -+ ${MAKE} -C libhosts_gatherer install - - -- $(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus - $(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus - $(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus - $(INSTALL) -m 0444 include/libvers.h $(DESTDIR)${includedir}/nessus -@@ -64,22 +63,13 @@ - test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1 - $(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1 - -- @echo -- @echo ' --------------------------------------------------------------' -- @echo ' nessus-libraries has been sucessfully installed. ' -- @echo " Make sure that $(bindir) is in your PATH before you" -- @echo " continue " -- @if [ -f /etc/ld.so.conf ]; then echo " Be sure to add $(libdir) in /etc/ld.so.conf and type 'ldconfig'"; else echo ""; fi -- @echo ' --------------------------------------------------------------' -- @echo -- - clean : $(PCAP_CLEAN) -- -cd libnessus && ${MAKE} clean -- -cd libhosts_gatherer && ${MAKE} clean -+ -${MAKE} -C libnessus clean -+ -${MAKE} -C libhosts_gatherer clean - - distclean : clean $(PCAP_DISTCLEAN) - rm -f ${rootdir}/include/config.h libtool config.cache \ - config.status config.log ${rootdir}/include/libvers.h -- -cd libnessus && ${MAKE} distclean -- -cd libhosts_gatherer && ${MAKE} distclean -+ -${MAKE} -C libnessus distclean -+ -${MAKE} -C libhosts_gatherer distclean - rm -f nessus.tmpl nessus-config nessus-config.pre uninstall-nessus Property changes on: head/security/nessus-libraries/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/nessus-libraries/files/patch-ac =================================================================== --- head/security/nessus-libraries/files/patch-ac (revision 363327) +++ head/security/nessus-libraries/files/patch-ac (nonexistent) @@ -1,15 +0,0 @@ ---- libpcap-nessus/configure.orig Mon Jul 31 11:09:51 2000 -+++ libpcap-nessus/configure Wed May 29 12:07:45 2002 -@@ -391,9 +391,9 @@ - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi -- if test "x$nonopt" != xNONE; then -- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -- fi -+# if test "x$nonopt" != xNONE; then -+# { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } -+# fi - nonopt="$ac_option" - ;; - Property changes on: head/security/nessus-libraries/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/nessus-libraries/files/patch-Makefile =================================================================== --- head/security/nessus-libraries/files/patch-Makefile (nonexistent) +++ head/security/nessus-libraries/files/patch-Makefile (revision 363328) @@ -0,0 +1,85 @@ +--- Makefile.orig 2004-01-09 00:55:13.000000000 +0800 ++++ Makefile 2013-07-28 16:41:08.000000000 +0800 +@@ -3,8 +3,8 @@ + ALLDEPS = nessus.tmpl nessus-config + + all: $(ALLDEPS) $(PCAP_MAKE) +- cd libnessus && ${MAKE} +- cd libhosts_gatherer && ${MAKE} ++ ${MAKE} -C libnessus ++ ${MAKE} -C libhosts_gatherer + + nessus-config: nessus-config.pre Makefile nessus.tmpl + @echo Creating $@ ... +@@ -19,8 +19,8 @@ + touch $@ + + win32: +- -cd libpcap-nessus && ${MAKE} distclean +- -cd libhosts_gatherer && ${MAKE} distclean ++ -${MAKE} -C libpcap-nessus distclean ++ -${MAKE} -C libhosts_gatherer distclean + @echo + @echo ' --------------------------------------------------------------' + @echo ' The header files necessary and some docs have been generated,' +@@ -31,27 +31,26 @@ + + + pcap-make : +- -cd libpcap-nessus && ${MAKE} ++ -${MAKE} -C libpcap-nessus + + pcap-install: + test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix} + test -d $(DESTDIR)${libdir} || ${INSTALL_DIR} -m 755 $(DESTDIR)${libdir} +- -cd libpcap-nessus && ${MAKE} install ++ -${MAKE} -C libpcap-nessus install + + pcap-clean : +- -cd libpcap-nessus && ${MAKE} clean ++ -${MAKE} -C libpcap-nessus clean + + pcap-distclean: +- -cd libpcap-nessus && ${MAKE} distclean ++ -${MAKE} -C libpcap-nessus distclean + + install : $(PCAP_INSTALL) + test -d $(DESTDIR)${prefix} || ${INSTALL_DIR} -m 755 $(DESTDIR)${prefix} + test -d $(DESTDIR)${includedir}/nessus || ${INSTALL_DIR} -m 755 $(DESTDIR)${includedir}/nessus +- cd libnessus && ${MAKE} install +- cd libhosts_gatherer && ${MAKE} install ++ ${MAKE} -C libnessus install ++ ${MAKE} -C libhosts_gatherer install + + +- $(INSTALL) -m 0444 include/includes.h $(DESTDIR)${includedir}/nessus + $(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus + $(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus + $(INSTALL) -m 0444 include/libvers.h $(DESTDIR)${includedir}/nessus +@@ -64,22 +63,13 @@ + test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1 + $(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1 + +- @echo +- @echo ' --------------------------------------------------------------' +- @echo ' nessus-libraries has been sucessfully installed. ' +- @echo " Make sure that $(bindir) is in your PATH before you" +- @echo " continue " +- @if [ -f /etc/ld.so.conf ]; then echo " Be sure to add $(libdir) in /etc/ld.so.conf and type 'ldconfig'"; else echo ""; fi +- @echo ' --------------------------------------------------------------' +- @echo +- + clean : $(PCAP_CLEAN) +- -cd libnessus && ${MAKE} clean +- -cd libhosts_gatherer && ${MAKE} clean ++ -${MAKE} -C libnessus clean ++ -${MAKE} -C libhosts_gatherer clean + + distclean : clean $(PCAP_DISTCLEAN) + rm -f ${rootdir}/include/config.h libtool config.cache \ + config.status config.log ${rootdir}/include/libvers.h +- -cd libnessus && ${MAKE} distclean +- -cd libhosts_gatherer && ${MAKE} distclean ++ -${MAKE} -C libnessus distclean ++ -${MAKE} -C libhosts_gatherer distclean + rm -f nessus.tmpl nessus-config nessus-config.pre uninstall-nessus Property changes on: head/security/nessus-libraries/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/nessus-libraries/files/patch-libpcap-nessus__configure =================================================================== --- head/security/nessus-libraries/files/patch-libpcap-nessus__configure (nonexistent) +++ head/security/nessus-libraries/files/patch-libpcap-nessus__configure (revision 363328) @@ -0,0 +1,15 @@ +--- libpcap-nessus/configure.orig Mon Jul 31 11:09:51 2000 ++++ libpcap-nessus/configure Wed May 29 12:07:45 2002 +@@ -391,9 +391,9 @@ + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi +- if test "x$nonopt" != xNONE; then +- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } +- fi ++# if test "x$nonopt" != xNONE; then ++# { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ++# fi + nonopt="$ac_option" + ;; + Property changes on: head/security/nessus-libraries/files/patch-libpcap-nessus__configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/openssl/files/patch-ad =================================================================== --- head/security/openssl/files/patch-ad (revision 363327) +++ head/security/openssl/files/patch-ad (nonexistent) @@ -1,11 +0,0 @@ ---- crypto/md5/md5.c.orig Thu Apr 9 07:59:29 1998 -+++ crypto/md5/md5.c Sun Dec 27 18:44:33 1998 -@@ -94,7 +94,7 @@ - err++; - continue; - } -- printf("MD5(%s)= ",argv[i]); -+ printf("MD5 (%s) = ",argv[i]); - do_fp(IN); - fclose(IN); - } Property changes on: head/security/openssl/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/openssl/files/patch-ak =================================================================== --- head/security/openssl/files/patch-ak (revision 363327) +++ head/security/openssl/files/patch-ak (nonexistent) @@ -1,11 +0,0 @@ ---- apps/Makefile.orig Tue Aug 10 11:09:07 2004 -+++ apps/Makefile Tue Oct 26 07:00:51 2004 -@@ -112,7 +112,7 @@ - done - @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ - chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ -- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf -+ mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample - - tags: - ctags $(SRC) Property changes on: head/security/openssl/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/openssl/files/patch-apps__Makefile =================================================================== --- head/security/openssl/files/patch-apps__Makefile (nonexistent) +++ head/security/openssl/files/patch-apps__Makefile (revision 363328) @@ -0,0 +1,11 @@ +--- apps/Makefile.orig Tue Aug 10 11:09:07 2004 ++++ apps/Makefile Tue Oct 26 07:00:51 2004 +@@ -112,7 +112,7 @@ + done + @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ + chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ +- mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf ++ mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample + + tags: + ctags $(SRC) Property changes on: head/security/openssl/files/patch-apps__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/openssl/files/patch-crypto__md5__md5.c =================================================================== --- head/security/openssl/files/patch-crypto__md5__md5.c (nonexistent) +++ head/security/openssl/files/patch-crypto__md5__md5.c (revision 363328) @@ -0,0 +1,11 @@ +--- crypto/md5/md5.c.orig Thu Apr 9 07:59:29 1998 ++++ crypto/md5/md5.c Sun Dec 27 18:44:33 1998 +@@ -94,7 +94,7 @@ + err++; + continue; + } +- printf("MD5(%s)= ",argv[i]); ++ printf("MD5 (%s) = ",argv[i]); + do_fp(IN); + fclose(IN); + } Property changes on: head/security/openssl/files/patch-crypto__md5__md5.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pam_ldap/files/patch-aa =================================================================== --- head/security/pam_ldap/files/patch-aa (revision 363327) +++ head/security/pam_ldap/files/patch-aa (nonexistent) @@ -1,23 +0,0 @@ ---- Makefile.in.orig 2010-12-17 14:34:23.708132000 -0500 -+++ Makefile.in 2010-12-17 14:35:48.000000000 -0500 -@@ -594,17 +594,13 @@ uninstall-man: uninstall-man5 - - install-exec-local: pam_ldap.so - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir)/security --@EXTENSION_SO_TRUE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so --@EXTENSION_1_TRUE@@EXTENSION_SO_FALSE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/libpam_ldap.1 --@EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1 --@EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@ (cd $(DESTDIR)$(libdir)/security; rm -f pam_ldap.so; ln -s pam_ldap.so.1 pam_ldap.so) -+ $(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so - - install-data-local: - @$(NORMAL_INSTALL) -- @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \ -+ @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.dist; then \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ -- $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \ -+ $(INSTALL_DATA) -o root -g wheel $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.dist; \ - fi - - uninstall-local: Property changes on: head/security/pam_ldap/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/pam_ldap/files/patch-ab =================================================================== --- head/security/pam_ldap/files/patch-ab (revision 363327) +++ head/security/pam_ldap/files/patch-ab (nonexistent) @@ -1,65 +0,0 @@ ---- pam_ldap.c.orig 2010-12-17 14:36:11.105528000 -0500 -+++ pam_ldap.c 2010-12-17 14:38:42.000000000 -0500 -@@ -131,12 +131,7 @@ - #include "pam_ldap.h" - #include "md5.h" - --#if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H) || defined(OPENPAM) -- /* FIXME: is there something better to check? */ - #define CONST_ARG const --#else --#define CONST_ARG --#endif - - #ifndef HAVE_LDAP_MEMFREE - #define ldap_memfree(x) free(x) -@@ -3411,7 +3406,7 @@ pam_sm_authenticate (pam_handle_t * pamh - int rc; - const char *username; - char *p; -- int use_first_pass = 0, try_first_pass = 0, ignore_flags = 0; -+ int use_first_pass = 0, try_first_pass = 0, ignore_flags = 0, migrate = 0; - int i; - pam_ldap_session_t *session = NULL; - const char *configFile = NULL; -@@ -3432,6 +3427,8 @@ pam_sm_authenticate (pam_handle_t * pamh - ; - else if (!strcmp (argv[i], "debug")) - ; -+ else if (!strcmp (argv[i], "migrate")) -+ migrate = 1; - else - syslog (LOG_ERR, "illegal option %s", argv[i]); - } -@@ -3445,6 +3442,22 @@ pam_sm_authenticate (pam_handle_t * pamh - return rc; - - rc = pam_get_item (pamh, PAM_AUTHTOK, (CONST_ARG void **) &p); -+ /* start of migrate facility in "pam_ldap authentication" */ -+ if (migrate==1 && rc==PAM_SUCCESS) -+ { -+ /* check if specified username exists in LDAP */ -+ if (_get_user_info(session,username)==PAM_SUCCESS) -+ { -+ /* -+ overwrite old LDAP userPassword with a new password -+ obtained during pam authentication process -+ - rootbinddn and ldap.secret must be set -+ */ -+ rc=_update_authtok(pamh,session,username,NULL,p); -+ return PAM_IGNORE; -+ } -+ } -+ /* end of migrate facility in "pam_ldap authentication" */ - if (rc == PAM_SUCCESS && (use_first_pass || try_first_pass)) - { - rc = _do_authentication (pamh, session, username, p); -@@ -3721,7 +3734,7 @@ pam_sm_chauthtok (pam_handle_t * pamh, i - if (curpass == NULL) - return PAM_MAXTRIES; /* maximum tries exceeded */ - else -- pam_set_item (pamh, PAM_OLDAUTHTOK, (void *) curpass); -+ pam_set_item (pamh, PAM_OLDAUTHTOK, (void *) strdup(curpass)); - } - else - { Property changes on: head/security/pam_ldap/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/pam_ldap/files/patch-Makefile.in =================================================================== --- head/security/pam_ldap/files/patch-Makefile.in (nonexistent) +++ head/security/pam_ldap/files/patch-Makefile.in (revision 363328) @@ -0,0 +1,23 @@ +--- Makefile.in.orig 2010-12-17 14:34:23.708132000 -0500 ++++ Makefile.in 2010-12-17 14:35:48.000000000 -0500 +@@ -594,17 +594,13 @@ uninstall-man: uninstall-man5 + + install-exec-local: pam_ldap.so + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir)/security +-@EXTENSION_SO_TRUE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so +-@EXTENSION_1_TRUE@@EXTENSION_SO_FALSE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/libpam_ldap.1 +-@EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@ $(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so.1 +-@EXTENSION_1_FALSE@@EXTENSION_SO_FALSE@ (cd $(DESTDIR)$(libdir)/security; rm -f pam_ldap.so; ln -s pam_ldap.so.1 pam_ldap.so) ++ $(INSTALL_PROGRAM) -o root -g wheel pam_ldap.so $(DESTDIR)$(libdir)/pam_ldap.so + + install-data-local: + @$(NORMAL_INSTALL) +- @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \ ++ @if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.dist; then \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ +- $(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \ ++ $(INSTALL_DATA) -o root -g wheel $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.dist; \ + fi + + uninstall-local: Property changes on: head/security/pam_ldap/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pam_ldap/files/patch-pam_ldap.c =================================================================== --- head/security/pam_ldap/files/patch-pam_ldap.c (nonexistent) +++ head/security/pam_ldap/files/patch-pam_ldap.c (revision 363328) @@ -0,0 +1,65 @@ +--- pam_ldap.c.orig 2010-12-17 14:36:11.105528000 -0500 ++++ pam_ldap.c 2010-12-17 14:38:42.000000000 -0500 +@@ -131,12 +131,7 @@ + #include "pam_ldap.h" + #include "md5.h" + +-#if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H) || defined(OPENPAM) +- /* FIXME: is there something better to check? */ + #define CONST_ARG const +-#else +-#define CONST_ARG +-#endif + + #ifndef HAVE_LDAP_MEMFREE + #define ldap_memfree(x) free(x) +@@ -3411,7 +3406,7 @@ pam_sm_authenticate (pam_handle_t * pamh + int rc; + const char *username; + char *p; +- int use_first_pass = 0, try_first_pass = 0, ignore_flags = 0; ++ int use_first_pass = 0, try_first_pass = 0, ignore_flags = 0, migrate = 0; + int i; + pam_ldap_session_t *session = NULL; + const char *configFile = NULL; +@@ -3432,6 +3427,8 @@ pam_sm_authenticate (pam_handle_t * pamh + ; + else if (!strcmp (argv[i], "debug")) + ; ++ else if (!strcmp (argv[i], "migrate")) ++ migrate = 1; + else + syslog (LOG_ERR, "illegal option %s", argv[i]); + } +@@ -3445,6 +3442,22 @@ pam_sm_authenticate (pam_handle_t * pamh + return rc; + + rc = pam_get_item (pamh, PAM_AUTHTOK, (CONST_ARG void **) &p); ++ /* start of migrate facility in "pam_ldap authentication" */ ++ if (migrate==1 && rc==PAM_SUCCESS) ++ { ++ /* check if specified username exists in LDAP */ ++ if (_get_user_info(session,username)==PAM_SUCCESS) ++ { ++ /* ++ overwrite old LDAP userPassword with a new password ++ obtained during pam authentication process ++ - rootbinddn and ldap.secret must be set ++ */ ++ rc=_update_authtok(pamh,session,username,NULL,p); ++ return PAM_IGNORE; ++ } ++ } ++ /* end of migrate facility in "pam_ldap authentication" */ + if (rc == PAM_SUCCESS && (use_first_pass || try_first_pass)) + { + rc = _do_authentication (pamh, session, username, p); +@@ -3721,7 +3734,7 @@ pam_sm_chauthtok (pam_handle_t * pamh, i + if (curpass == NULL) + return PAM_MAXTRIES; /* maximum tries exceeded */ + else +- pam_set_item (pamh, PAM_OLDAUTHTOK, (void *) curpass); ++ pam_set_item (pamh, PAM_OLDAUTHTOK, (void *) strdup(curpass)); + } + else + { Property changes on: head/security/pam_ldap/files/patch-pam_ldap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pgp/files/patch-aa =================================================================== --- head/security/pgp/files/patch-aa (revision 363327) +++ head/security/pgp/files/patch-aa (nonexistent) @@ -1,58 +0,0 @@ ---- makefile.orig 1996-01-18 11:42:36.000000000 +0100 -+++ makefile 2011-06-24 19:56:53.000000000 +0200 -@@ -50,15 +50,16 @@ - # -DUSE_SELECT to use select() system call - # -DUSE_NBIO to use non-blocking read() - --CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER) -+PREFIX ?=/usr/local -+CFLAGS+= -O -DUNIX -DPORTABLE $(BYTEORDER) -DPREFIX=\"$(PREFIX)\" - - # must set byte order for targets "sysv" and "bsd" - # BYTEORDER= -DHIGHFIRST - --CC = cc --LD = cc # Link command --LDFLAGS = --CPP = $(CC) -E -+CC ?= cc -+LD ?= cc # Link command -+LDFLAGS ?= -+CPP ?= $(CC) -E - DBG = -O - RM = rm -f - -@@ -79,7 +80,7 @@ - @echo "where can be:" - @echo " 386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo," - @echo " apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos," -- @echo " dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi," -+ @echo " dgux, djgpp, encore, freebsd-{alpha,amd64,i386,sparc64}, hpux-68k(*), hpux-68k-ansi," - @echo " hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc," - @echo " hpux9-pa-ansi, irix, irix_asm, isc, isc_asm, linux, linux-68k," - @echo " machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm," -@@ -171,10 +172,21 @@ - $(MAKE) all CC=gcc LD=gcc \ - CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32" - --freebsd: -+freebsd-i386: - $(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \ -- CFLAGS="$(RSAINCDIR) -O2 -fno-strength-reduce -DUNIX -DIDEA32 -DASM \ -- -DMAX_NAMELEN=255" -+ CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS) -DUNIX \ -+ -DIDEA32 -DASM -DMAX_NAMELEN=255" -+ -+freebsd-alpha: freebsd -+ -+freebsd-amd64: freebsd -+ -+freebsd-sparc64: freebsd -+ -+freebsd: -+ $(MAKE) all LD="$(CC) -s" \ -+ CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS) \ -+ -DPORTABLE -DUNIX -DIDEA32 -DMAX_NAMELEN=255" - - 386bsd: - $(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \ Property changes on: head/security/pgp/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/pgp/files/patch-makefile =================================================================== --- head/security/pgp/files/patch-makefile (nonexistent) +++ head/security/pgp/files/patch-makefile (revision 363328) @@ -0,0 +1,58 @@ +--- makefile.orig 1996-01-18 11:42:36.000000000 +0100 ++++ makefile 2011-06-24 19:56:53.000000000 +0200 +@@ -50,15 +50,16 @@ + # -DUSE_SELECT to use select() system call + # -DUSE_NBIO to use non-blocking read() + +-CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER) ++PREFIX ?=/usr/local ++CFLAGS+= -O -DUNIX -DPORTABLE $(BYTEORDER) -DPREFIX=\"$(PREFIX)\" + + # must set byte order for targets "sysv" and "bsd" + # BYTEORDER= -DHIGHFIRST + +-CC = cc +-LD = cc # Link command +-LDFLAGS = +-CPP = $(CC) -E ++CC ?= cc ++LD ?= cc # Link command ++LDFLAGS ?= ++CPP ?= $(CC) -E + DBG = -O + RM = rm -f + +@@ -79,7 +80,7 @@ + @echo "where can be:" + @echo " 386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo," + @echo " apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos," +- @echo " dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi," ++ @echo " dgux, djgpp, encore, freebsd-{alpha,amd64,i386,sparc64}, hpux-68k(*), hpux-68k-ansi," + @echo " hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc," + @echo " hpux9-pa-ansi, irix, irix_asm, isc, isc_asm, linux, linux-68k," + @echo " machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm," +@@ -171,10 +172,21 @@ + $(MAKE) all CC=gcc LD=gcc \ + CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32" + +-freebsd: ++freebsd-i386: + $(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \ +- CFLAGS="$(RSAINCDIR) -O2 -fno-strength-reduce -DUNIX -DIDEA32 -DASM \ +- -DMAX_NAMELEN=255" ++ CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS) -DUNIX \ ++ -DIDEA32 -DASM -DMAX_NAMELEN=255" ++ ++freebsd-alpha: freebsd ++ ++freebsd-amd64: freebsd ++ ++freebsd-sparc64: freebsd ++ ++freebsd: ++ $(MAKE) all LD="$(CC) -s" \ ++ CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS) \ ++ -DPORTABLE -DUNIX -DIDEA32 -DMAX_NAMELEN=255" + + 386bsd: + $(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \ Property changes on: head/security/pgp/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pktsuckers/files/patch-aa =================================================================== --- head/security/pktsuckers/files/patch-aa (revision 363327) +++ head/security/pktsuckers/files/patch-aa (nonexistent) @@ -1,26 +0,0 @@ ---- Makefile.orig Mon May 31 20:32:49 1999 -+++ Makefile Tue Jun 1 13:17:49 1999 -@@ -3,8 +3,8 @@ - # $Date: 1999/06/01 03:32:48 $ - # - --DESTDIR= /usr/local/libexec --CFLAGS= -Wall -+DESTDIR= ${PREFIX}/libexec -+CFLAGS?= -Wall - LDFLAGS= -static - - all: tcpsuck udpsuck -@@ -16,10 +16,10 @@ - @echo '' - - tcpsuck: tcpsuck.o dump_pkt.o -- cc -o tcpsuck $(LDFLAGS) tcpsuck.o dump_pkt.o -+ ${CC} ${CFLAGS} -o tcpsuck $(LDFLAGS) tcpsuck.o dump_pkt.o - - udpsuck: udpsuck.o dump_pkt.o -- cc -o udpsuck $(LDFLAGS) udpsuck.o dump_pkt.o -+ ${CC} ${CFLAGS} -o udpsuck $(LDFLAGS) udpsuck.o dump_pkt.o - - clean: - rm -f *.o *.BAK *.core tcpsuck udpsuck Property changes on: head/security/pktsuckers/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/pktsuckers/files/patch-Makefile =================================================================== --- head/security/pktsuckers/files/patch-Makefile (nonexistent) +++ head/security/pktsuckers/files/patch-Makefile (revision 363328) @@ -0,0 +1,26 @@ +--- Makefile.orig Mon May 31 20:32:49 1999 ++++ Makefile Tue Jun 1 13:17:49 1999 +@@ -3,8 +3,8 @@ + # $Date: 1999/06/01 03:32:48 $ + # + +-DESTDIR= /usr/local/libexec +-CFLAGS= -Wall ++DESTDIR= ${PREFIX}/libexec ++CFLAGS?= -Wall + LDFLAGS= -static + + all: tcpsuck udpsuck +@@ -16,10 +16,10 @@ + @echo '' + + tcpsuck: tcpsuck.o dump_pkt.o +- cc -o tcpsuck $(LDFLAGS) tcpsuck.o dump_pkt.o ++ ${CC} ${CFLAGS} -o tcpsuck $(LDFLAGS) tcpsuck.o dump_pkt.o + + udpsuck: udpsuck.o dump_pkt.o +- cc -o udpsuck $(LDFLAGS) udpsuck.o dump_pkt.o ++ ${CC} ${CFLAGS} -o udpsuck $(LDFLAGS) udpsuck.o dump_pkt.o + + clean: + rm -f *.o *.BAK *.core tcpsuck udpsuck Property changes on: head/security/pktsuckers/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/proxycheck/files/patch-ab =================================================================== --- head/security/proxycheck/files/patch-ab (revision 363327) +++ head/security/proxycheck/files/patch-ab (nonexistent) @@ -1,20 +0,0 @@ ---- proxycheck.c.orig Fri Jun 13 03:07:12 2003 -+++ proxycheck.c Fri Jun 13 03:07:53 2003 -@@ -974,7 +974,7 @@ - dstspec = strdup(pxybuf); - } - -- dsbluser = egetenv("DSBL_USER", "anonimous"); -+ dsbluser = egetenv("DSBL_USER", "anonymous"); - dsblpass = egetenv("DSBL_PASS", ""); - dsblfrom = egetenv("DSBL_FROM", dsbluser); - dsblrcpt = egetenv("DSBL_RCPT", "listme@listme.dsbl.org"); -@@ -1015,7 +1015,7 @@ - { "dsbl", dsblh, dsbld, dsble, dsbli, "[:smtpserver[:port]]", - "attempt to submit proxy to DSBL-like system\n" - " DSBL settings are expected to be in environment:\n" -- "\t$DSBL_USER - username (anonimous)\n" -+ "\t$DSBL_USER - username (anonymous)\n" - "\t$DSBL_PASS - password (default is empty)\n" - "\t$DSBL_COOKIE_HOST - cookie server (cookie.dsbl.org)\n" - "\t$DSBL_COOKIE - already obtained DSBL cookie\n" Property changes on: head/security/proxycheck/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/proxycheck/files/patch-ac =================================================================== --- head/security/proxycheck/files/patch-ac (revision 363327) +++ head/security/proxycheck/files/patch-ac (nonexistent) @@ -1,149 +0,0 @@ ---- proxycheck.1.orig Sun May 11 10:47:38 2003 -+++ proxycheck.1 Mon Jun 30 03:23:58 2003 -@@ -2,12 +2,13 @@ - .\" manpage for proxycheck - .\" Michael Tokarev -- - .TH proxycheck 1 - - .SH NAME -+ - proxycheck \- open proxy server checker - - .SH SYNOPSYS -+ - \fBproxycheck\fR \fIoptions\fR \fIhost\fR[:\fIproto_port_spec\fR]... - - .SH DESCRIPTION -@@ -39,15 +40,12 @@ - - .IP \fB\-h\fR - print a short help and exit. -- - .IP \fB\-v\fR - increase the verbosity level. All debugging messages will - go to standard error stream. -- - .IP "\fB\-d\fR \fIdeshost\fR:\fIdestport\fR (required)" - try to establish a proxied connection to the given \fIdsthost\fR, - port \fIdstport\fR. This option is required. -- - .IP "\fB\-c\fR \fIcheck\fR[:\fIparams\fR] (required)" - the "method" \fBproxycheck\fR will use when talking to a destination - system to determine if a proxy is open or not. Interpretation of -@@ -72,54 +70,45 @@ - (username, password, recipient address, cookie server, ...) are - expected to be found in environment variables. Run \fBproxycheck\fR - with \fB\-h\fR option to see a list of recognized variables and --their default values. By default, \fBproxycheck\fR will anonimously -+their default values. By default, \fBproxycheck\fR will anonymously - submit all found proxies to unconfirmed.dsbl.org (which isn't very - useful). For trusted DSBL user, at least DSBL_USER and DSBL_PASS - variables should be set properly. - .RE -- - .IP "\fB\-p\fR \fIproto_port_spec\fR" - specifies protocol and ports to connect to. If not given, \fBproxycheck\fR - will try it's built-in default list. This option may be specified more - than once. See below for \fIproto_port_spec\fR. If \fIproto_port_spec\fR - is specified for a single host to check, it applies to that host only, - and no protocols/ports in default list will be checked for that host. -- - .IP \fB\-D\fR - do not reset default port list when using \fB\-p\fR option, but prepend - new ports to it instead. -- - .IP \fB\-a\fR - use more "advanced" ports/protocols. The more \fB\-a\fR's given, the more - ports/protocols will be probed. For a complete list of all ports and protocols - and their level, execute \fBproxycheck\fR with \fB\-h\fR option. -- - .IP "\fB\-t\fR \fItimeout\fR" - a timeout, in secounds, for every operation. Default value is 30 secounds. - The timer starts at the connection attempt to the proxy itself, after - sending the "connect" command to the proxy and so on. -- - .IP "\fB\-m\fR \fImaxconn\fR" - Do not attempt to make more than \fImaxconn\fR parallel connections. - By default, maximum number of parallel connections limited by the - operating system and on most systems it is around 1000. -- - .IP "\fB\-M\fR \fImaxhconn\fR" - Do not make more than \fImaxhconn\fR parallel connections to the - same host (default is unlimited). This may be useful for overloaded - proxies which can't handle many parallel connections using different - ports/protocols, but may significantly slow down the whole process. -- - .IP \fB\-s\fR - when an open proxy is found on a given IP, stop probing for other - ports/protocols for this IP. Best used when many IPs are tested, - and/or with \fB\-M\fR option. This is because currently, \fBproxycheck\fR - will not make any \fInew\fR connections to such host, but will wait - for already active connections to complete. -- - .IP "\fB\-b\fR \fIbindaddr\fR" - use \fIbindaddr\fR as a source address for all outgoing connections. -- - .IP \fB\-n\fR - write a line about definitely closed proxies to stdout in additional - to writing about open proxies, in a form -@@ -127,7 +116,6 @@ - .nf - 127.0.0.1 http:8080 closed - .fi -- - .IP \fB\-x\fR - print extended proxy information (proxy-agent and the like) if available. - This will be on the same "open" (or "closed" with -n) line, last, enclosed -@@ -236,6 +224,51 @@ - proxy server was found. In case of incorrect usage, it will exit - with code 1. If no open proxies where found, \fBproxycheck\fR - will return 0. -+ -+.SH EXAMPLES -+In the simplest case, specify: -+ -+.nf -+ proxycheck -vv -ddsthost:dstport -c chat::"waitstr" \fIlist-of-IPs\fR -+.fi -+ -+where -+\fBdsthost\fR is the host and \fBdstport\fR is the port number of the -+destination system, and \fBwaitstr\fR is a string to look for from the remote -+system. If you decide to connect to your own mailserver (which is quite -+logical, since most proxy abuse nowadays is to send spam to your mailserver), -+connect to it first using telnet and see which SMTP greeting string it prints -+out upon connection, and use this string as \fBwaitstr\fR. For example, if -+your mailserver is \fImail.example.com\fR, the following may apply: -+ -+.nf -+ $ \fBtelnet mail.example.com 25\fR -+ Telnet: trying 127.0.0.1... connected. -+ 250 mail.example.com ESMTP welcome -+ \fBQUIT\fR -+.fi -+ -+In this case, \fBproxycheck\fR's command line may look as follows: -+ -+.nf -+ proxycheck -vv -d mail.example.com:25 \\ -+ -c chat::"250 mail.example.com ESMTP welcome" \fIlist-of-IPs\fR -+.fi -+ -+Another usage scenario is to automatically submit all open proxies to -+DSBL.org-style blocklists. For this, specify \fB-c dsbl\fR and set up -+environment variables for dsbl client. The variables \fBDSBL_USER\fR and -+\fBDSBL_PASS\fR are required for non-anonymous DSBL submissions, for anonymous -+submissions to the \fIunconfirmed.dsbl.org\fR defaults are sufficient. To -+submit a proxy to DSBL.org, set destination to the mail exchanger of -+\fIlistme.dsbl.org\fR domain, currently \fImx.listme.dsbl.org\fR. For example: -+ -+.nf -+ DSBL_USER=username DSBL_PASS=password ./proxycheck -vv \\ -+ -dmx.listme.dsbl.org:25 -cdsbl \fIproxyhost\fR -+.fi -+ -+Additional and updated information may be found at the URL below. - - .SH LICENSE - This program is free software. It may be used and distributed Property changes on: head/security/proxycheck/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/proxycheck/files/patch-proxycheck.1 =================================================================== --- head/security/proxycheck/files/patch-proxycheck.1 (nonexistent) +++ head/security/proxycheck/files/patch-proxycheck.1 (revision 363328) @@ -0,0 +1,149 @@ +--- proxycheck.1.orig Sun May 11 10:47:38 2003 ++++ proxycheck.1 Mon Jun 30 03:23:58 2003 +@@ -2,12 +2,13 @@ + .\" manpage for proxycheck + .\" Michael Tokarev +- + .TH proxycheck 1 + + .SH NAME ++ + proxycheck \- open proxy server checker + + .SH SYNOPSYS ++ + \fBproxycheck\fR \fIoptions\fR \fIhost\fR[:\fIproto_port_spec\fR]... + + .SH DESCRIPTION +@@ -39,15 +40,12 @@ + + .IP \fB\-h\fR + print a short help and exit. +- + .IP \fB\-v\fR + increase the verbosity level. All debugging messages will + go to standard error stream. +- + .IP "\fB\-d\fR \fIdeshost\fR:\fIdestport\fR (required)" + try to establish a proxied connection to the given \fIdsthost\fR, + port \fIdstport\fR. This option is required. +- + .IP "\fB\-c\fR \fIcheck\fR[:\fIparams\fR] (required)" + the "method" \fBproxycheck\fR will use when talking to a destination + system to determine if a proxy is open or not. Interpretation of +@@ -72,54 +70,45 @@ + (username, password, recipient address, cookie server, ...) are + expected to be found in environment variables. Run \fBproxycheck\fR + with \fB\-h\fR option to see a list of recognized variables and +-their default values. By default, \fBproxycheck\fR will anonimously ++their default values. By default, \fBproxycheck\fR will anonymously + submit all found proxies to unconfirmed.dsbl.org (which isn't very + useful). For trusted DSBL user, at least DSBL_USER and DSBL_PASS + variables should be set properly. + .RE +- + .IP "\fB\-p\fR \fIproto_port_spec\fR" + specifies protocol and ports to connect to. If not given, \fBproxycheck\fR + will try it's built-in default list. This option may be specified more + than once. See below for \fIproto_port_spec\fR. If \fIproto_port_spec\fR + is specified for a single host to check, it applies to that host only, + and no protocols/ports in default list will be checked for that host. +- + .IP \fB\-D\fR + do not reset default port list when using \fB\-p\fR option, but prepend + new ports to it instead. +- + .IP \fB\-a\fR + use more "advanced" ports/protocols. The more \fB\-a\fR's given, the more + ports/protocols will be probed. For a complete list of all ports and protocols + and their level, execute \fBproxycheck\fR with \fB\-h\fR option. +- + .IP "\fB\-t\fR \fItimeout\fR" + a timeout, in secounds, for every operation. Default value is 30 secounds. + The timer starts at the connection attempt to the proxy itself, after + sending the "connect" command to the proxy and so on. +- + .IP "\fB\-m\fR \fImaxconn\fR" + Do not attempt to make more than \fImaxconn\fR parallel connections. + By default, maximum number of parallel connections limited by the + operating system and on most systems it is around 1000. +- + .IP "\fB\-M\fR \fImaxhconn\fR" + Do not make more than \fImaxhconn\fR parallel connections to the + same host (default is unlimited). This may be useful for overloaded + proxies which can't handle many parallel connections using different + ports/protocols, but may significantly slow down the whole process. +- + .IP \fB\-s\fR + when an open proxy is found on a given IP, stop probing for other + ports/protocols for this IP. Best used when many IPs are tested, + and/or with \fB\-M\fR option. This is because currently, \fBproxycheck\fR + will not make any \fInew\fR connections to such host, but will wait + for already active connections to complete. +- + .IP "\fB\-b\fR \fIbindaddr\fR" + use \fIbindaddr\fR as a source address for all outgoing connections. +- + .IP \fB\-n\fR + write a line about definitely closed proxies to stdout in additional + to writing about open proxies, in a form +@@ -127,7 +116,6 @@ + .nf + 127.0.0.1 http:8080 closed + .fi +- + .IP \fB\-x\fR + print extended proxy information (proxy-agent and the like) if available. + This will be on the same "open" (or "closed" with -n) line, last, enclosed +@@ -236,6 +224,51 @@ + proxy server was found. In case of incorrect usage, it will exit + with code 1. If no open proxies where found, \fBproxycheck\fR + will return 0. ++ ++.SH EXAMPLES ++In the simplest case, specify: ++ ++.nf ++ proxycheck -vv -ddsthost:dstport -c chat::"waitstr" \fIlist-of-IPs\fR ++.fi ++ ++where ++\fBdsthost\fR is the host and \fBdstport\fR is the port number of the ++destination system, and \fBwaitstr\fR is a string to look for from the remote ++system. If you decide to connect to your own mailserver (which is quite ++logical, since most proxy abuse nowadays is to send spam to your mailserver), ++connect to it first using telnet and see which SMTP greeting string it prints ++out upon connection, and use this string as \fBwaitstr\fR. For example, if ++your mailserver is \fImail.example.com\fR, the following may apply: ++ ++.nf ++ $ \fBtelnet mail.example.com 25\fR ++ Telnet: trying 127.0.0.1... connected. ++ 250 mail.example.com ESMTP welcome ++ \fBQUIT\fR ++.fi ++ ++In this case, \fBproxycheck\fR's command line may look as follows: ++ ++.nf ++ proxycheck -vv -d mail.example.com:25 \\ ++ -c chat::"250 mail.example.com ESMTP welcome" \fIlist-of-IPs\fR ++.fi ++ ++Another usage scenario is to automatically submit all open proxies to ++DSBL.org-style blocklists. For this, specify \fB-c dsbl\fR and set up ++environment variables for dsbl client. The variables \fBDSBL_USER\fR and ++\fBDSBL_PASS\fR are required for non-anonymous DSBL submissions, for anonymous ++submissions to the \fIunconfirmed.dsbl.org\fR defaults are sufficient. To ++submit a proxy to DSBL.org, set destination to the mail exchanger of ++\fIlistme.dsbl.org\fR domain, currently \fImx.listme.dsbl.org\fR. For example: ++ ++.nf ++ DSBL_USER=username DSBL_PASS=password ./proxycheck -vv \\ ++ -dmx.listme.dsbl.org:25 -cdsbl \fIproxyhost\fR ++.fi ++ ++Additional and updated information may be found at the URL below. + + .SH LICENSE + This program is free software. It may be used and distributed Property changes on: head/security/proxycheck/files/patch-proxycheck.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/proxycheck/files/patch-proxycheck.c =================================================================== --- head/security/proxycheck/files/patch-proxycheck.c (nonexistent) +++ head/security/proxycheck/files/patch-proxycheck.c (revision 363328) @@ -0,0 +1,20 @@ +--- proxycheck.c.orig Fri Jun 13 03:07:12 2003 ++++ proxycheck.c Fri Jun 13 03:07:53 2003 +@@ -974,7 +974,7 @@ + dstspec = strdup(pxybuf); + } + +- dsbluser = egetenv("DSBL_USER", "anonimous"); ++ dsbluser = egetenv("DSBL_USER", "anonymous"); + dsblpass = egetenv("DSBL_PASS", ""); + dsblfrom = egetenv("DSBL_FROM", dsbluser); + dsblrcpt = egetenv("DSBL_RCPT", "listme@listme.dsbl.org"); +@@ -1015,7 +1015,7 @@ + { "dsbl", dsblh, dsbld, dsble, dsbli, "[:smtpserver[:port]]", + "attempt to submit proxy to DSBL-like system\n" + " DSBL settings are expected to be in environment:\n" +- "\t$DSBL_USER - username (anonimous)\n" ++ "\t$DSBL_USER - username (anonymous)\n" + "\t$DSBL_PASS - password (default is empty)\n" + "\t$DSBL_COOKIE_HOST - cookie server (cookie.dsbl.org)\n" + "\t$DSBL_COOKIE - already obtained DSBL cookie\n" Property changes on: head/security/proxycheck/files/patch-proxycheck.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-aa =================================================================== --- head/security/rdigest/files/patch-aa (revision 363327) +++ head/security/rdigest/files/patch-aa (nonexistent) @@ -1,60 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/03/28 20:52:55 agc Exp $ - ---- Makefile.in.orig 2005-03-28 21:39:38.000000000 +0100 -+++ Makefile.in 2005-03-28 21:41:02.000000000 +0100 -@@ -57,7 +57,7 @@ - .c.o: - $(COMPILE) -c $< -o $@ - --all: digest -+all: rdigest - - digest-types.h: bits - ./bits digest-types.h -@@ -65,10 +65,10 @@ - bits: bits.o - $(LINK) $(bits_OBJS) $(LIBS) - --digest: $(digest_OBJS) -+rdigest: $(digest_OBJS) - $(LINK) $(digest_OBJS) $(LIBS) - --check: digest -+check: rdigest - @SHELL@ $(srcdir)/regress.sh - - digest.o: digest-types.h -@@ -84,7 +84,7 @@ - whirlpool.o: digest-types.h - - clean: -- rm -f *.o digest bits digest-types.h -+ rm -f *.o rdigest bits digest-types.h - - distclean: clean - rm -f Makefile config.h -@@ -93,18 +93,18 @@ - maintainer-clean: distclean - rm -f configure config.h.in - --install: digest -+install: rdigest - $(mkinstalldirs) $(DESTDIR)$(bindir) -- @f=`echo digest|sed '$(transform)'`; \ -- echo "$(INSTALL_PROGRAM) digest $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM) digest $(DESTDIR)$(bindir)/$$f -+ @f=`echo rdigest|sed '$(transform)'`; \ -+ echo "$(INSTALL_PROGRAM) rdigest $(DESTDIR)$(bindir)/$$f"; \ -+ $(INSTALL_PROGRAM) rdigest $(DESTDIR)$(bindir)/$$f - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -- @f=`echo digest.1|sed '$(transform)'`; \ -+ @f=`echo rdigest.1|sed '$(transform)'`; \ - echo "$(INSTALL_DATA) digest.1 $(DESTDIR)$(mandir)/man1/$$f"; \ - $(INSTALL_DATA) digest.1 $(DESTDIR)$(mandir)/man1/$$f - - uninstall: -- @f=`echo digest|sed '$(transform)'`; \ -+ @f=`echo rdigest|sed '$(transform)'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f - Property changes on: head/security/rdigest/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-ab =================================================================== --- head/security/rdigest/files/patch-ab (revision 363327) +++ head/security/rdigest/files/patch-ab (nonexistent) @@ -1,90 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/03/31 05:02:24 atatat Exp $ - ---- digest.1.orig 2005-03-30 23:40:39.000000000 -0500 -+++ digest.1 -@@ -2,5 +2,5 @@ - .\" - .\" --.\" Copyright (c) 2001 Alistair G. Crooks. All rights reserved. -+.\" Copyright (c) 2001-2005 Alistair G. Crooks. All rights reserved. - .\" - .\" Redistribution and use in source and binary forms, with or without -@@ -32,12 +32,13 @@ - .\" - .\" --.Dd March 23, 2005 --.Dt DIGEST 1 -+.Dd March 31, 2005 -+.Dt RDIGEST 1 - .Os - .Sh NAME --.Nm digest --.Nd calculate message digests -+.Nm rdigest -+.Nd calculate message digests of files and directories - .Sh SYNOPSIS - .Nm -+.Op Fl x Ar directory - .Ar algorithm - .Op file ... -@@ -45,6 +46,13 @@ - The - .Nm --utility calculates message digests of files or, -+utility calculates message digests of files, directories, or, - if no file is specified, standard input. -+The -+.Fl x -+option can be used as many times as required to indicate directories -+not to be included in a directory's hash. -+This allows you to skip, eg, CVS subdirectories in a given tree, which -+can have relatively volatile contents not pertinent to the hash. -+.Pp - The list of possible algorithms is: - .Bl -tag -width Ds -@@ -89,4 +97,23 @@ algorithm implementations, which are loc - C library, and was designed to be scalable as new message digest - algorithms are developed. -+The checksum for a directory is implemented as the hash over a list of -+one or two hashes for each of the items in the tree. -+.Bl -bullet -+.It -+For a file, the string -+.Dq f \& -+along with the path make up the data for one hash, and the contents of -+the file is used for the second hash. -+.It -+For a symbolic link, the string -+.Dq l \& -+along with the path to the symbolic link make up the data for one -+hash, and the target of the symbolic link is used for the second hash. -+.It -+For a directory, the string -+.Dq d \& -+along with the path make up the data for one hash. -+There is no second hash for a directory. -+.El - .Pp - The -@@ -95,4 +122,5 @@ utility exits 0 on success, and \*[Gt]0 - .Sh SEE ALSO - .Xr cksum 1 , -+.Xr digest 1 , - .Xr md5 3 , - .Xr rmd160 3 , -@@ -102,8 +130,12 @@ The - .Nm - utility first appeared in --.Nx 1.6 . -+.Nx 2.0 . - .Sh AUTHORS - The -+.Xr digest 1 -+utility was written by Alistair G. Crooks \*[Lt]agc@netbsd.org\*[Gt]. - .Nm --utility was written by --.An Alistair G. Crooks Aq agc@netbsd.org . -+was implemented by Andrew Brown \*[Lt]atatat@netbsd.org\*[Gt] as a -+patch to -+.Xr digest 1 -+to add recursive capabilities. Property changes on: head/security/rdigest/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-ac =================================================================== --- head/security/rdigest/files/patch-ac (revision 363327) +++ head/security/rdigest/files/patch-ac (nonexistent) @@ -1,210 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2005/01/21 02:18:23 tv Exp $ - ---- digest.c.orig 2005-01-20 21:10:03.000000000 -0500 -+++ digest.c -@@ -43,9 +43,14 @@ __RCSID("$NetBSD: digest.c,v 1.8 2003/07 - #endif - - -+#include -+#include -+ - #ifdef HAVE_ERRNO_H - #include - #endif -+#include -+#include - #ifdef HAVE_LOCALE_H - #include - #endif -@@ -147,21 +152,178 @@ digest_file(char *fn, alg_t *alg) - return (rc); - } - -+struct excl { -+ LIST_ENTRY(excl) n; -+ const char *p; -+}; -+ -+LIST_HEAD(, excl) excl; -+ -+static void -+exclude(const char *p) -+{ -+ struct excl *e; -+ -+ e = malloc(sizeof(struct excl)); -+ e->p = p; -+ LIST_INSERT_HEAD(&excl, e, n); -+} -+ -+static int -+skip(const char *p) -+{ -+ struct excl *e; -+ -+#ifdef LIST_FOREACH -+ LIST_FOREACH(e, &excl, n) -+#else -+ for (e = excl.lh_first; e; e = e->n.le_next) -+#endif -+ if (strcmp(e->p, p) == 0) -+ return (1); -+ -+ return (0); -+} -+ -+static int -+compar(const FTSENT **fa, const FTSENT **fb) -+{ -+ return (strcmp((*fa)->fts_name, (*fb)->fts_name)); -+} -+ -+static int -+digest_directory(char *dn, alg_t *alg) -+{ -+ char in[BUFSIZ * 20], dot[2]; -+ char *digest; -+ int cc, rc, l, fd, cwd; -+ char *pathlist[2]; -+ FTS *ftsp; -+ FTSENT *f; -+ -+ rc = 1; -+ l = alg->hash_len * 2; -+ digest = malloc(l + 1); -+ sprintf(dot, "."); -+ pathlist[0] = dot; -+ pathlist[1] = NULL; -+ -+ if ((cwd = open(".", O_RDONLY)) == -1 || -+ chdir(dn) == -1 || -+ (ftsp = fts_open(pathlist, -+ FTS_COMFOLLOW | FTS_NOCHDIR | FTS_PHYSICAL, -+ compar)) == NULL) { -+ (void) fprintf(stderr, "%s\n", dn); -+ free(digest); -+ return (0); -+ } -+ -+ (*alg->hash_init)(&alg->hash_ctx); -+ -+ while ((f = fts_read(ftsp)) != NULL) { -+ /* skip the second pass on a directory */ -+ if (f->fts_info == FTS_DP) -+ continue; -+ -+ /* skip directories named CVS, RCS, or SCCS */ -+ if ((f->fts_info == FTS_NS || -+ S_ISDIR(f->fts_statp->st_mode)) && -+ skip(f->fts_name)) { -+ fts_set(ftsp, f, FTS_SKIP); -+ continue; -+ } -+ -+ /* try to handle things based on stat info */ -+ if (f->fts_info != FTS_NS) { -+ /* only mention directories */ -+ if (S_ISDIR(f->fts_statp->st_mode)) { -+ (*alg->hash_init)(&alg->hash_ctx2); -+ (*alg->hash_update)(&alg->hash_ctx2, "d ", 2); -+ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); -+ (*alg->hash_end)(&alg->hash_ctx2, digest); -+ digest[l] = '\n'; -+ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); -+ -+ /* hash the filename and then the contents separately */ -+ } else if (S_ISREG(f->fts_statp->st_mode)) { -+ if ((fd = open(f->fts_path, O_RDONLY)) != -1) { -+ (*alg->hash_init)(&alg->hash_ctx2); -+ (*alg->hash_update)(&alg->hash_ctx2, "f ", 2); -+ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); -+ (*alg->hash_end)(&alg->hash_ctx2, &digest[0]); -+ digest[l] = '\n'; -+ (*alg->hash_update)(&alg->hash_ctx, digest, 33); -+ -+ (*alg->hash_init)(&alg->hash_ctx2); -+ while ((cc = read(fd, in, sizeof(in))) > 0) { -+ (*alg->hash_update)(&alg->hash_ctx2, in, cc); -+ } -+ close(fd); -+ (*alg->hash_end)(&alg->hash_ctx2, digest); -+ digest[l] = '\n'; -+ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); -+ } else { -+ (void) fprintf(stderr, "%s\n", f->fts_path); -+ rc = 0; -+ } -+ -+ /* hash in symlinks as well, along with the link contents */ -+ } else if (S_ISLNK(f->fts_statp->st_mode)) { -+ if ((cc = readlink(f->fts_path, in, sizeof(in))) > 0) { -+ (*alg->hash_init)(&alg->hash_ctx2); -+ (*alg->hash_update)(&alg->hash_ctx2, "l ", 2); -+ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); -+ (*alg->hash_end)(&alg->hash_ctx2, digest); -+ digest[l] = '\n'; -+ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); -+ -+ (*alg->hash_init)(&alg->hash_ctx2); -+ (*alg->hash_update)(&alg->hash_ctx2, in, cc); -+ (*alg->hash_end)(&alg->hash_ctx2, digest); -+ digest[l] = '\n'; -+ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); -+ } else { -+ (void) fprintf(stderr, "%s\n", f->fts_path); -+ rc = 0; -+ } -+ } -+ } -+ } -+ -+ fts_close(ftsp); -+ fchdir(cwd); -+ close(cwd); -+ -+ if (rc == 1) { -+ (*alg->hash_end)(&alg->hash_ctx, digest); -+ (void) printf("%s (%s) = %s\n", alg->name, dn, digest); -+ } -+ -+ free(digest); -+ return (rc); -+} -+ - int - main(int argc, char **argv) - { - alg_t *alg; - int rval; - int i; -+ struct stat st; -+ -+ LIST_INIT(&excl); - - #ifdef HAVE_SETLOCALE - (void) setlocale(LC_ALL, ""); - #endif -- while ((i = getopt(argc, argv, "V")) != -1) { -+ while ((i = getopt(argc, argv, "Vx:")) != -1) { - switch(i) { - case 'V': - printf("%s\n", VERSION); - return EXIT_SUCCESS; -+ case 'x': -+ exclude(optarg); -+ break; - } - } - argc -= optind; -@@ -186,7 +348,9 @@ main(int argc, char **argv) - } - } else { - for (i = 0 ; i < argc ; i++) { -- if (!digest_file(argv[i], alg)) { -+ if (stat(argv[i], &st) == -1 || -+ (S_ISREG(st.st_mode) && !digest_file(argv[i], alg)) || -+ (S_ISDIR(st.st_mode) && !digest_directory(argv[i], alg))) { - (void) fprintf(stderr, "%s\n", argv[i]); - rval = EXIT_FAILURE; - } Property changes on: head/security/rdigest/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-Makefile.in =================================================================== --- head/security/rdigest/files/patch-Makefile.in (nonexistent) +++ head/security/rdigest/files/patch-Makefile.in (revision 363328) @@ -0,0 +1,60 @@ +$NetBSD: patch-aa,v 1.2 2005/03/28 20:52:55 agc Exp $ + +--- Makefile.in.orig 2005-03-28 21:39:38.000000000 +0100 ++++ Makefile.in 2005-03-28 21:41:02.000000000 +0100 +@@ -57,7 +57,7 @@ + .c.o: + $(COMPILE) -c $< -o $@ + +-all: digest ++all: rdigest + + digest-types.h: bits + ./bits digest-types.h +@@ -65,10 +65,10 @@ + bits: bits.o + $(LINK) $(bits_OBJS) $(LIBS) + +-digest: $(digest_OBJS) ++rdigest: $(digest_OBJS) + $(LINK) $(digest_OBJS) $(LIBS) + +-check: digest ++check: rdigest + @SHELL@ $(srcdir)/regress.sh + + digest.o: digest-types.h +@@ -84,7 +84,7 @@ + whirlpool.o: digest-types.h + + clean: +- rm -f *.o digest bits digest-types.h ++ rm -f *.o rdigest bits digest-types.h + + distclean: clean + rm -f Makefile config.h +@@ -93,18 +93,18 @@ + maintainer-clean: distclean + rm -f configure config.h.in + +-install: digest ++install: rdigest + $(mkinstalldirs) $(DESTDIR)$(bindir) +- @f=`echo digest|sed '$(transform)'`; \ +- echo "$(INSTALL_PROGRAM) digest $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM) digest $(DESTDIR)$(bindir)/$$f ++ @f=`echo rdigest|sed '$(transform)'`; \ ++ echo "$(INSTALL_PROGRAM) rdigest $(DESTDIR)$(bindir)/$$f"; \ ++ $(INSTALL_PROGRAM) rdigest $(DESTDIR)$(bindir)/$$f + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 +- @f=`echo digest.1|sed '$(transform)'`; \ ++ @f=`echo rdigest.1|sed '$(transform)'`; \ + echo "$(INSTALL_DATA) digest.1 $(DESTDIR)$(mandir)/man1/$$f"; \ + $(INSTALL_DATA) digest.1 $(DESTDIR)$(mandir)/man1/$$f + + uninstall: +- @f=`echo digest|sed '$(transform)'`; \ ++ @f=`echo rdigest|sed '$(transform)'`; \ + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ + rm -f $(DESTDIR)$(bindir)/$$f + Property changes on: head/security/rdigest/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-digest.1 =================================================================== --- head/security/rdigest/files/patch-digest.1 (nonexistent) +++ head/security/rdigest/files/patch-digest.1 (revision 363328) @@ -0,0 +1,90 @@ +$NetBSD: patch-ab,v 1.3 2005/03/31 05:02:24 atatat Exp $ + +--- digest.1.orig 2005-03-30 23:40:39.000000000 -0500 ++++ digest.1 +@@ -2,5 +2,5 @@ + .\" + .\" +-.\" Copyright (c) 2001 Alistair G. Crooks. All rights reserved. ++.\" Copyright (c) 2001-2005 Alistair G. Crooks. All rights reserved. + .\" + .\" Redistribution and use in source and binary forms, with or without +@@ -32,12 +32,13 @@ + .\" + .\" +-.Dd March 23, 2005 +-.Dt DIGEST 1 ++.Dd March 31, 2005 ++.Dt RDIGEST 1 + .Os + .Sh NAME +-.Nm digest +-.Nd calculate message digests ++.Nm rdigest ++.Nd calculate message digests of files and directories + .Sh SYNOPSIS + .Nm ++.Op Fl x Ar directory + .Ar algorithm + .Op file ... +@@ -45,6 +46,13 @@ + The + .Nm +-utility calculates message digests of files or, ++utility calculates message digests of files, directories, or, + if no file is specified, standard input. ++The ++.Fl x ++option can be used as many times as required to indicate directories ++not to be included in a directory's hash. ++This allows you to skip, eg, CVS subdirectories in a given tree, which ++can have relatively volatile contents not pertinent to the hash. ++.Pp + The list of possible algorithms is: + .Bl -tag -width Ds +@@ -89,4 +97,23 @@ algorithm implementations, which are loc + C library, and was designed to be scalable as new message digest + algorithms are developed. ++The checksum for a directory is implemented as the hash over a list of ++one or two hashes for each of the items in the tree. ++.Bl -bullet ++.It ++For a file, the string ++.Dq f \& ++along with the path make up the data for one hash, and the contents of ++the file is used for the second hash. ++.It ++For a symbolic link, the string ++.Dq l \& ++along with the path to the symbolic link make up the data for one ++hash, and the target of the symbolic link is used for the second hash. ++.It ++For a directory, the string ++.Dq d \& ++along with the path make up the data for one hash. ++There is no second hash for a directory. ++.El + .Pp + The +@@ -95,4 +122,5 @@ utility exits 0 on success, and \*[Gt]0 + .Sh SEE ALSO + .Xr cksum 1 , ++.Xr digest 1 , + .Xr md5 3 , + .Xr rmd160 3 , +@@ -102,8 +130,12 @@ The + .Nm + utility first appeared in +-.Nx 1.6 . ++.Nx 2.0 . + .Sh AUTHORS + The ++.Xr digest 1 ++utility was written by Alistair G. Crooks \*[Lt]agc@netbsd.org\*[Gt]. + .Nm +-utility was written by +-.An Alistair G. Crooks Aq agc@netbsd.org . ++was implemented by Andrew Brown \*[Lt]atatat@netbsd.org\*[Gt] as a ++patch to ++.Xr digest 1 ++to add recursive capabilities. Property changes on: head/security/rdigest/files/patch-digest.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/rdigest/files/patch-digest.c =================================================================== --- head/security/rdigest/files/patch-digest.c (nonexistent) +++ head/security/rdigest/files/patch-digest.c (revision 363328) @@ -0,0 +1,210 @@ +$NetBSD: patch-ac,v 1.2 2005/01/21 02:18:23 tv Exp $ + +--- digest.c.orig 2005-01-20 21:10:03.000000000 -0500 ++++ digest.c +@@ -43,9 +43,14 @@ __RCSID("$NetBSD: digest.c,v 1.8 2003/07 + #endif + + ++#include ++#include ++ + #ifdef HAVE_ERRNO_H + #include + #endif ++#include ++#include + #ifdef HAVE_LOCALE_H + #include + #endif +@@ -147,21 +152,178 @@ digest_file(char *fn, alg_t *alg) + return (rc); + } + ++struct excl { ++ LIST_ENTRY(excl) n; ++ const char *p; ++}; ++ ++LIST_HEAD(, excl) excl; ++ ++static void ++exclude(const char *p) ++{ ++ struct excl *e; ++ ++ e = malloc(sizeof(struct excl)); ++ e->p = p; ++ LIST_INSERT_HEAD(&excl, e, n); ++} ++ ++static int ++skip(const char *p) ++{ ++ struct excl *e; ++ ++#ifdef LIST_FOREACH ++ LIST_FOREACH(e, &excl, n) ++#else ++ for (e = excl.lh_first; e; e = e->n.le_next) ++#endif ++ if (strcmp(e->p, p) == 0) ++ return (1); ++ ++ return (0); ++} ++ ++static int ++compar(const FTSENT **fa, const FTSENT **fb) ++{ ++ return (strcmp((*fa)->fts_name, (*fb)->fts_name)); ++} ++ ++static int ++digest_directory(char *dn, alg_t *alg) ++{ ++ char in[BUFSIZ * 20], dot[2]; ++ char *digest; ++ int cc, rc, l, fd, cwd; ++ char *pathlist[2]; ++ FTS *ftsp; ++ FTSENT *f; ++ ++ rc = 1; ++ l = alg->hash_len * 2; ++ digest = malloc(l + 1); ++ sprintf(dot, "."); ++ pathlist[0] = dot; ++ pathlist[1] = NULL; ++ ++ if ((cwd = open(".", O_RDONLY)) == -1 || ++ chdir(dn) == -1 || ++ (ftsp = fts_open(pathlist, ++ FTS_COMFOLLOW | FTS_NOCHDIR | FTS_PHYSICAL, ++ compar)) == NULL) { ++ (void) fprintf(stderr, "%s\n", dn); ++ free(digest); ++ return (0); ++ } ++ ++ (*alg->hash_init)(&alg->hash_ctx); ++ ++ while ((f = fts_read(ftsp)) != NULL) { ++ /* skip the second pass on a directory */ ++ if (f->fts_info == FTS_DP) ++ continue; ++ ++ /* skip directories named CVS, RCS, or SCCS */ ++ if ((f->fts_info == FTS_NS || ++ S_ISDIR(f->fts_statp->st_mode)) && ++ skip(f->fts_name)) { ++ fts_set(ftsp, f, FTS_SKIP); ++ continue; ++ } ++ ++ /* try to handle things based on stat info */ ++ if (f->fts_info != FTS_NS) { ++ /* only mention directories */ ++ if (S_ISDIR(f->fts_statp->st_mode)) { ++ (*alg->hash_init)(&alg->hash_ctx2); ++ (*alg->hash_update)(&alg->hash_ctx2, "d ", 2); ++ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); ++ (*alg->hash_end)(&alg->hash_ctx2, digest); ++ digest[l] = '\n'; ++ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); ++ ++ /* hash the filename and then the contents separately */ ++ } else if (S_ISREG(f->fts_statp->st_mode)) { ++ if ((fd = open(f->fts_path, O_RDONLY)) != -1) { ++ (*alg->hash_init)(&alg->hash_ctx2); ++ (*alg->hash_update)(&alg->hash_ctx2, "f ", 2); ++ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); ++ (*alg->hash_end)(&alg->hash_ctx2, &digest[0]); ++ digest[l] = '\n'; ++ (*alg->hash_update)(&alg->hash_ctx, digest, 33); ++ ++ (*alg->hash_init)(&alg->hash_ctx2); ++ while ((cc = read(fd, in, sizeof(in))) > 0) { ++ (*alg->hash_update)(&alg->hash_ctx2, in, cc); ++ } ++ close(fd); ++ (*alg->hash_end)(&alg->hash_ctx2, digest); ++ digest[l] = '\n'; ++ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); ++ } else { ++ (void) fprintf(stderr, "%s\n", f->fts_path); ++ rc = 0; ++ } ++ ++ /* hash in symlinks as well, along with the link contents */ ++ } else if (S_ISLNK(f->fts_statp->st_mode)) { ++ if ((cc = readlink(f->fts_path, in, sizeof(in))) > 0) { ++ (*alg->hash_init)(&alg->hash_ctx2); ++ (*alg->hash_update)(&alg->hash_ctx2, "l ", 2); ++ (*alg->hash_update)(&alg->hash_ctx2, f->fts_path, f->fts_pathlen); ++ (*alg->hash_end)(&alg->hash_ctx2, digest); ++ digest[l] = '\n'; ++ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); ++ ++ (*alg->hash_init)(&alg->hash_ctx2); ++ (*alg->hash_update)(&alg->hash_ctx2, in, cc); ++ (*alg->hash_end)(&alg->hash_ctx2, digest); ++ digest[l] = '\n'; ++ (*alg->hash_update)(&alg->hash_ctx, digest, l + 1); ++ } else { ++ (void) fprintf(stderr, "%s\n", f->fts_path); ++ rc = 0; ++ } ++ } ++ } ++ } ++ ++ fts_close(ftsp); ++ fchdir(cwd); ++ close(cwd); ++ ++ if (rc == 1) { ++ (*alg->hash_end)(&alg->hash_ctx, digest); ++ (void) printf("%s (%s) = %s\n", alg->name, dn, digest); ++ } ++ ++ free(digest); ++ return (rc); ++} ++ + int + main(int argc, char **argv) + { + alg_t *alg; + int rval; + int i; ++ struct stat st; ++ ++ LIST_INIT(&excl); + + #ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL, ""); + #endif +- while ((i = getopt(argc, argv, "V")) != -1) { ++ while ((i = getopt(argc, argv, "Vx:")) != -1) { + switch(i) { + case 'V': + printf("%s\n", VERSION); + return EXIT_SUCCESS; ++ case 'x': ++ exclude(optarg); ++ break; + } + } + argc -= optind; +@@ -186,7 +348,9 @@ main(int argc, char **argv) + } + } else { + for (i = 0 ; i < argc ; i++) { +- if (!digest_file(argv[i], alg)) { ++ if (stat(argv[i], &st) == -1 || ++ (S_ISREG(st.st_mode) && !digest_file(argv[i], alg)) || ++ (S_ISDIR(st.st_mode) && !digest_directory(argv[i], alg))) { + (void) fprintf(stderr, "%s\n", argv[i]); + rval = EXIT_FAILURE; + } Property changes on: head/security/rdigest/files/patch-digest.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/slush/files/patch-aa =================================================================== --- head/security/slush/files/patch-aa (revision 363327) +++ head/security/slush/files/patch-aa (nonexistent) @@ -1,22 +0,0 @@ ---- Makefile.in.orig Tue Apr 6 01:05:04 1999 -+++ Makefile.in Sat Jan 29 16:23:51 2000 -@@ -9,8 +9,8 @@ - - CC=@CC@ - INSTALL=@INSTALL@ --CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/ssl/include -I/usr/include/ssl --LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto -+CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl -I$(LOCALBASE)/include -+LIBS=@LIBS@ -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil - - all: slush slushd - -@@ -38,7 +38,7 @@ - install: $(SBINDIR)/slushd $(MANDIR)/slush.8 - - cert: -- ssleay req -new -x509 -nodes \ -+ openssl req -new -x509 -nodes \ - -out slushd.pem -days 365 -keyout slushd.pem - - clean: Property changes on: head/security/slush/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/slush/files/patch-ab =================================================================== --- head/security/slush/files/patch-ab (revision 363327) +++ head/security/slush/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- slush.c- Mon Oct 27 06:19:50 2003 -+++ slush.c Mon Oct 27 06:21:46 2003 -@@ -34,7 +34,10 @@ - #include - #include - #include -+#include -+#if __FreeBSD_version >= 500000 - #include -+#endif - #include - #include - #include Property changes on: head/security/slush/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/slush/files/patch-ac =================================================================== --- head/security/slush/files/patch-ac (revision 363327) +++ head/security/slush/files/patch-ac (nonexistent) @@ -1,113 +0,0 @@ ---- slushd.c -+++ slushd.c -@@ -40,11 +40,19 @@ - #include - #include - #include -+#include -+#if __FreeBSD_version >= 500000 - #include -+#endif - #include - #include - #include -+#if __FreeBSD_version >= 900007 -+#include -+#else - #include -+#include -+#endif - #include - #include - #include -@@ -653,59 +661,42 @@ - /* exits on error */ - void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout) - { -- struct utmp ut; -- int wtmp; -- int lock; -- -- tty = strrchr(tty, '/'); -- if (tty == NULL) -- { -- syslog(LOG_ERR, "Can't determine basename of tty"); -- exit(3); -- } -- tty++; -- -- utmpname(_PATH_UTMP); -- setutent(); -- memset(&ut, 0, sizeof(ut)); -+#if __FreeBSD_version >= 900007 -+ struct utmpx ut; - -- if (ut.ut_id[0] == 0) -- strncpy(ut.ut_id, tty + 3, sizeof(ut.ut_id)); -+ if (strncmp(tty, "/dev/", 5) == 0) -+ tty += 5; - -- if (!is_logout) -- strncpy(ut.ut_user, pw->pw_name, sizeof(ut.ut_user)); -- -- strncpy(ut.ut_line, tty, sizeof(ut.ut_line) - 1); -- ut.ut_line[sizeof(ut.ut_line) - 1] = 0; -- -- ut.ut_time = time(NULL); -- ut.ut_type = is_logout?DEAD_PROCESS:USER_PROCESS; -- ut.ut_pid = getpid(); -- -- strncpy(ut.ut_host, hostname, sizeof(ut.ut_host) - 1); -- ut.ut_host[sizeof(ut.ut_host) - 1] = 0; -- -- memcpy(&ut.ut_addr, i, sizeof(ut.ut_addr)); -+ memset(&ut, 0, sizeof ut); -+ gettimeofday(&ut.ut_tv, NULL); -+ strncpy(ut.ut_id, tty, sizeof ut.ut_id); -+ -+ if (is_logout) { -+ ut.ut_type = DEAD_PROCESS; -+ } else { -+ ut.ut_type = USER_PROCESS; -+ strncpy(ut.ut_line, tty, sizeof ut.ut_line); -+ strncpy(ut.ut_user, pw->pw_name, sizeof ut.ut_user); -+ strncpy(ut.ut_host, inet_ntoa(*i), sizeof ut.ut_host); -+ } -+ pututxline(&ut); -+#else -+ struct utmp ut; - -- pututline(&ut); -- endutent(); -+ if (strncmp(tty, "/dev/", 5) == 0) -+ tty += 5; - -- lock = open(_PATH_WTMPLOCK, O_CREAT|O_WRONLY, 0660); -- if (lock == -1) -- ioerror("open"); -- -- if (flock(lock, LOCK_EX) == -1) -- ioerror("flock"); -- -- wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY); -- if (wtmp == -1) -- ioerror("open"); -- -- write(wtmp, (char *)&ut, sizeof(ut)); -- close(wtmp); -+ if (is_logout) { -+ logout(tty); -+ return; -+ } - -- flock(lock, LOCK_UN); -- close(lock); -+ strncpy(ut.ut_line, tty, sizeof ut.ut_line); -+ strncpy(ut.ut_name, pw->pw_name, sizeof ut.ut_name); -+ strncpy(ut.ut_host, inet_ntoa(*i), sizeof ut.ut_host); -+ ut.ut_time = time(0); -+ login(&ut); -+#endif - } - - /* Retrieve client X509 certificate and test authentication */ Property changes on: head/security/slush/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/slush/files/patch-Makefile.in =================================================================== --- head/security/slush/files/patch-Makefile.in (nonexistent) +++ head/security/slush/files/patch-Makefile.in (revision 363328) @@ -0,0 +1,22 @@ +--- Makefile.in.orig Tue Apr 6 01:05:04 1999 ++++ Makefile.in Sat Jan 29 16:23:51 2000 +@@ -9,8 +9,8 @@ + + CC=@CC@ + INSTALL=@INSTALL@ +-CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/ssl/include -I/usr/include/ssl +-LIBS=@LIBS@ -L/usr/local/ssl/lib -lssl -lcrypto ++CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl -I$(LOCALBASE)/include ++LIBS=@LIBS@ -L$(OPENSSLLIB) -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil + + all: slush slushd + +@@ -38,7 +38,7 @@ + install: $(SBINDIR)/slushd $(MANDIR)/slush.8 + + cert: +- ssleay req -new -x509 -nodes \ ++ openssl req -new -x509 -nodes \ + -out slushd.pem -days 365 -keyout slushd.pem + + clean: Property changes on: head/security/slush/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/slush/files/patch-slush.c =================================================================== --- head/security/slush/files/patch-slush.c (nonexistent) +++ head/security/slush/files/patch-slush.c (revision 363328) @@ -0,0 +1,13 @@ +--- slush.c- Mon Oct 27 06:19:50 2003 ++++ slush.c Mon Oct 27 06:21:46 2003 +@@ -34,7 +34,10 @@ + #include + #include + #include ++#include ++#if __FreeBSD_version >= 500000 + #include ++#endif + #include + #include + #include Property changes on: head/security/slush/files/patch-slush.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/slush/files/patch-slushd.c =================================================================== --- head/security/slush/files/patch-slushd.c (nonexistent) +++ head/security/slush/files/patch-slushd.c (revision 363328) @@ -0,0 +1,113 @@ +--- slushd.c ++++ slushd.c +@@ -40,11 +40,19 @@ + #include + #include + #include ++#include ++#if __FreeBSD_version >= 500000 + #include ++#endif + #include + #include + #include ++#if __FreeBSD_version >= 900007 ++#include ++#else + #include ++#include ++#endif + #include + #include + #include +@@ -653,59 +661,42 @@ + /* exits on error */ + void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout) + { +- struct utmp ut; +- int wtmp; +- int lock; +- +- tty = strrchr(tty, '/'); +- if (tty == NULL) +- { +- syslog(LOG_ERR, "Can't determine basename of tty"); +- exit(3); +- } +- tty++; +- +- utmpname(_PATH_UTMP); +- setutent(); +- memset(&ut, 0, sizeof(ut)); ++#if __FreeBSD_version >= 900007 ++ struct utmpx ut; + +- if (ut.ut_id[0] == 0) +- strncpy(ut.ut_id, tty + 3, sizeof(ut.ut_id)); ++ if (strncmp(tty, "/dev/", 5) == 0) ++ tty += 5; + +- if (!is_logout) +- strncpy(ut.ut_user, pw->pw_name, sizeof(ut.ut_user)); +- +- strncpy(ut.ut_line, tty, sizeof(ut.ut_line) - 1); +- ut.ut_line[sizeof(ut.ut_line) - 1] = 0; +- +- ut.ut_time = time(NULL); +- ut.ut_type = is_logout?DEAD_PROCESS:USER_PROCESS; +- ut.ut_pid = getpid(); +- +- strncpy(ut.ut_host, hostname, sizeof(ut.ut_host) - 1); +- ut.ut_host[sizeof(ut.ut_host) - 1] = 0; +- +- memcpy(&ut.ut_addr, i, sizeof(ut.ut_addr)); ++ memset(&ut, 0, sizeof ut); ++ gettimeofday(&ut.ut_tv, NULL); ++ strncpy(ut.ut_id, tty, sizeof ut.ut_id); ++ ++ if (is_logout) { ++ ut.ut_type = DEAD_PROCESS; ++ } else { ++ ut.ut_type = USER_PROCESS; ++ strncpy(ut.ut_line, tty, sizeof ut.ut_line); ++ strncpy(ut.ut_user, pw->pw_name, sizeof ut.ut_user); ++ strncpy(ut.ut_host, inet_ntoa(*i), sizeof ut.ut_host); ++ } ++ pututxline(&ut); ++#else ++ struct utmp ut; + +- pututline(&ut); +- endutent(); ++ if (strncmp(tty, "/dev/", 5) == 0) ++ tty += 5; + +- lock = open(_PATH_WTMPLOCK, O_CREAT|O_WRONLY, 0660); +- if (lock == -1) +- ioerror("open"); +- +- if (flock(lock, LOCK_EX) == -1) +- ioerror("flock"); +- +- wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY); +- if (wtmp == -1) +- ioerror("open"); +- +- write(wtmp, (char *)&ut, sizeof(ut)); +- close(wtmp); ++ if (is_logout) { ++ logout(tty); ++ return; ++ } + +- flock(lock, LOCK_UN); +- close(lock); ++ strncpy(ut.ut_line, tty, sizeof ut.ut_line); ++ strncpy(ut.ut_name, pw->pw_name, sizeof ut.ut_name); ++ strncpy(ut.ut_host, inet_ntoa(*i), sizeof ut.ut_host); ++ ut.ut_time = time(0); ++ login(&ut); ++#endif + } + + /* Retrieve client X509 certificate and test authentication */ Property changes on: head/security/slush/files/patch-slushd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/sslwrap/files/patch-aa =================================================================== --- head/security/sslwrap/files/patch-aa (revision 363327) +++ head/security/sslwrap/files/patch-aa (nonexistent) @@ -1,26 +0,0 @@ ---- Makefile.orig Tue Sep 28 05:49:54 1999 -+++ Makefile Thu Jan 27 23:09:09 2000 -@@ -6,16 +6,19 @@ - - # Debug/Optimizations - #OPT = -g --OPT = -O2 -+CFLAGS?=-O2 -+OPT = ${CFLAGS} -+ -+CC?= gcc - - # Define - OPENSSL="\"openssl/\"" - #OPENSSL="" - - all : -- gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ -- -L/usr/local/ssl/lib -lssl -lcrypto \ -- -I/usr/local/ssl/include \ -+ ${CC} -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ -+ -L${OPENSSLLIB} -lssl -lcrypto ${EXTRA_SSL_LIBS} \ -+ -I${OPENSSLINC} \ - ${EXTLIBS} - - clean: Property changes on: head/security/sslwrap/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/sslwrap/files/patch-Makefile =================================================================== --- head/security/sslwrap/files/patch-Makefile (nonexistent) +++ head/security/sslwrap/files/patch-Makefile (revision 363328) @@ -0,0 +1,26 @@ +--- Makefile.orig Tue Sep 28 05:49:54 1999 ++++ Makefile Thu Jan 27 23:09:09 2000 +@@ -6,16 +6,19 @@ + + # Debug/Optimizations + #OPT = -g +-OPT = -O2 ++CFLAGS?=-O2 ++OPT = ${CFLAGS} ++ ++CC?= gcc + + # Define + OPENSSL="\"openssl/\"" + #OPENSSL="" + + all : +- gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ +- -L/usr/local/ssl/lib -lssl -lcrypto \ +- -I/usr/local/ssl/include \ ++ ${CC} -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ ++ -L${OPENSSLLIB} -lssl -lcrypto ${EXTRA_SSL_LIBS} \ ++ -I${OPENSSLINC} \ + ${EXTLIBS} + + clean: Property changes on: head/security/sslwrap/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/steghide/files/patch-aa =================================================================== --- head/security/steghide/files/patch-aa (revision 363327) +++ head/security/steghide/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Oct 23 16:12:57 2003 -+++ Makefile.in Thu Oct 23 16:15:43 2003 -@@ -161,7 +161,7 @@ - SUBDIRS = m4 intl po doc src tests - docdir = $(prefix)/share/doc/$(PACKAGE) - EXTRA_DIST = config.rpath mkinstalldirs ABOUT-NLS BUGS CREDITS HISTORY LEAME depcomp --doc_DATA = ABOUT-NLS BUGS COPYING CREDITS HISTORY INSTALL LEAME README TODO -+doc_DATA = BUGS CREDITS HISTORY LEAME README TODO - MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ - config.sub configure depcomp install-sh missing mkinstalldirs steghide.doxygen steghide.spec - Property changes on: head/security/steghide/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/steghide/files/patch-Makefile.in =================================================================== --- head/security/steghide/files/patch-Makefile.in (nonexistent) +++ head/security/steghide/files/patch-Makefile.in (revision 363328) @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu Oct 23 16:12:57 2003 ++++ Makefile.in Thu Oct 23 16:15:43 2003 +@@ -161,7 +161,7 @@ + SUBDIRS = m4 intl po doc src tests + docdir = $(prefix)/share/doc/$(PACKAGE) + EXTRA_DIST = config.rpath mkinstalldirs ABOUT-NLS BUGS CREDITS HISTORY LEAME depcomp +-doc_DATA = ABOUT-NLS BUGS COPYING CREDITS HISTORY INSTALL LEAME README TODO ++doc_DATA = BUGS CREDITS HISTORY LEAME README TODO + MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ + config.sub configure depcomp install-sh missing mkinstalldirs steghide.doxygen steghide.spec + Property changes on: head/security/steghide/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/strobe/files/patch-aa =================================================================== --- head/security/strobe/files/patch-aa (revision 363327) +++ head/security/strobe/files/patch-aa (nonexistent) @@ -1,51 +0,0 @@ ---- Makefile.orig Thu Jul 3 04:48:00 1997 -+++ Makefile Tue Dec 29 11:15:04 1998 -@@ -3,15 +3,16 @@ - - # Modify the below to suit your filesystem - --INSTALLDIR=/usr/local/bin --LIBDIR=/usr/local/lib --MANDIR=/usr/local/man/man1 -+PREFIX?=/usr/local -+INSTALLDIR=${PREFIX}/bin -+LIBDIR=${PREFIX}/lib -+MANDIR=${PREFIX}/man/man1 - --#CC=cc --CC=gcc -+CC?=cc -+#CC=gcc - - #FLAGS=-O -nointl # SCO --FLAGS= -O -g -Wall -+FLAGS= -O -Wall - - #LIBS= -lnsl -lsocket # SYSVR4 / SOLARIS - #LIBS= -lsocket -lmalloc -lc_s # SCO -@@ -31,7 +32,7 @@ - -DSTROBE_SERVICES='"$(DATA)"'\ - -DETC_SERVICES='"$(ETC_SERVICES)"' - --CFLAGS=$(FLAGS) $(DEFS) -+CFLAGS+=$(DEFS) - - $(BIN): $(OBJS) - $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LIBS) -@@ -40,13 +41,13 @@ - $(MAN): - $(INSTALLDIR)/$(BIN): $(BIN) - -rm -f $(INSTALLDIR)/$(BIN) -- install -m 755 -s $(BIN) $(INSTALLDIR)/$(BIN) -+ install -c -o bin -g bin -m 755 -s $(BIN) $(INSTALLDIR)/$(BIN) - $(LIBDIR)/$(DATA): $(DATA) - -rm -f $(LIBDIR)/$(DATA) -- install -m 644 $(DATA) $(LIBDIR)/$(DATA) -+ install -c -o bin -g bin -m 644 $(DATA) $(LIBDIR)/$(DATA) - $(MANDIR)/$(MAN): $(MAN) - -rm -f $(MANDIR)/$(MAN) -- install -m 644 $(MAN) $(MANDIR)/$(MAN) -+ install -c -o bin -g bin -m 644 $(MAN) $(MANDIR)/$(MAN) - install: $(INSTALLDIR)/$(BIN) $(LIBDIR)/$(DATA) $(MANDIR)/$(MAN) - strobe.man : $(MAN) - nroff -man -Tascii $(MAN) > strobe.man Property changes on: head/security/strobe/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/strobe/files/patch-ab =================================================================== --- head/security/strobe/files/patch-ab (revision 363327) +++ head/security/strobe/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- strobe.orig 2010-03-13 19:26:31.000000000 +0100 -+++ strobe.c 2010-03-13 19:27:06.000000000 +0100 -@@ -1297,7 +1297,7 @@ - exit (1); - } - port_descs=(struct port_desc_s **) Smalloc(sizeof(struct port_descs_s *) * 65536); -- memset(port_descs, 0, 65536); -+ memset(port_descs, 0, sizeof(struct port_descs_s *) * 65536); - while (fgets (lbuf, sizeof (lbuf), fh)) - { - char *p; Property changes on: head/security/strobe/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/strobe/files/patch-Makefile =================================================================== --- head/security/strobe/files/patch-Makefile (nonexistent) +++ head/security/strobe/files/patch-Makefile (revision 363328) @@ -0,0 +1,51 @@ +--- Makefile.orig Thu Jul 3 04:48:00 1997 ++++ Makefile Tue Dec 29 11:15:04 1998 +@@ -3,15 +3,16 @@ + + # Modify the below to suit your filesystem + +-INSTALLDIR=/usr/local/bin +-LIBDIR=/usr/local/lib +-MANDIR=/usr/local/man/man1 ++PREFIX?=/usr/local ++INSTALLDIR=${PREFIX}/bin ++LIBDIR=${PREFIX}/lib ++MANDIR=${PREFIX}/man/man1 + +-#CC=cc +-CC=gcc ++CC?=cc ++#CC=gcc + + #FLAGS=-O -nointl # SCO +-FLAGS= -O -g -Wall ++FLAGS= -O -Wall + + #LIBS= -lnsl -lsocket # SYSVR4 / SOLARIS + #LIBS= -lsocket -lmalloc -lc_s # SCO +@@ -31,7 +32,7 @@ + -DSTROBE_SERVICES='"$(DATA)"'\ + -DETC_SERVICES='"$(ETC_SERVICES)"' + +-CFLAGS=$(FLAGS) $(DEFS) ++CFLAGS+=$(DEFS) + + $(BIN): $(OBJS) + $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LIBS) +@@ -40,13 +41,13 @@ + $(MAN): + $(INSTALLDIR)/$(BIN): $(BIN) + -rm -f $(INSTALLDIR)/$(BIN) +- install -m 755 -s $(BIN) $(INSTALLDIR)/$(BIN) ++ install -c -o bin -g bin -m 755 -s $(BIN) $(INSTALLDIR)/$(BIN) + $(LIBDIR)/$(DATA): $(DATA) + -rm -f $(LIBDIR)/$(DATA) +- install -m 644 $(DATA) $(LIBDIR)/$(DATA) ++ install -c -o bin -g bin -m 644 $(DATA) $(LIBDIR)/$(DATA) + $(MANDIR)/$(MAN): $(MAN) + -rm -f $(MANDIR)/$(MAN) +- install -m 644 $(MAN) $(MANDIR)/$(MAN) ++ install -c -o bin -g bin -m 644 $(MAN) $(MANDIR)/$(MAN) + install: $(INSTALLDIR)/$(BIN) $(LIBDIR)/$(DATA) $(MANDIR)/$(MAN) + strobe.man : $(MAN) + nroff -man -Tascii $(MAN) > strobe.man Property changes on: head/security/strobe/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/strobe/files/patch-strobe.c =================================================================== --- head/security/strobe/files/patch-strobe.c (nonexistent) +++ head/security/strobe/files/patch-strobe.c (revision 363328) @@ -0,0 +1,11 @@ +--- strobe.orig 2010-03-13 19:26:31.000000000 +0100 ++++ strobe.c 2010-03-13 19:27:06.000000000 +0100 +@@ -1297,7 +1297,7 @@ + exit (1); + } + port_descs=(struct port_desc_s **) Smalloc(sizeof(struct port_descs_s *) * 65536); +- memset(port_descs, 0, 65536); ++ memset(port_descs, 0, sizeof(struct port_descs_s *) * 65536); + while (fgets (lbuf, sizeof (lbuf), fh)) + { + char *p; Property changes on: head/security/strobe/files/patch-strobe.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/super/files/patch-localsys.h =================================================================== --- head/security/super/files/patch-localsys.h (revision 363327) +++ head/security/super/files/patch-localsys.h (nonexistent) @@ -1,9 +0,0 @@ ---- localsys.h.orig Fri Jun 18 09:22:22 2004 -+++ localsys.h Fri Sep 3 10:52:44 2004 -@@ -295,4 +295,6 @@ - -+#ifndef __FreeBSD__ /* FBSD has a malloc.h that tells people to obey C89. */ - #ifdef HAVE_MALLOC_H - #include -+#endif - #endif Property changes on: head/security/super/files/patch-localsys.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/super/files/patch-06 =================================================================== --- head/security/super/files/patch-06 (revision 363327) +++ head/security/super/files/patch-06 (nonexistent) @@ -1,18 +0,0 @@ ---- localsys.h.orig Mon Feb 15 02:27:37 1999 -+++ localsys.h Thu Feb 18 11:09:40 1999 -@@ -13,13 +13,13 @@ - * func_type funcname P__((arglist)); - */ - --#include "config.h" -- - #include - #include - #include - #include - #include -+ -+#include "config.h" - - #ifdef HAVE_UNISTD_H - #include Property changes on: head/security/super/files/patch-06 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/super/files/patch-localsys.h_1 =================================================================== --- head/security/super/files/patch-localsys.h_1 (nonexistent) +++ head/security/super/files/patch-localsys.h_1 (revision 363328) @@ -0,0 +1,18 @@ +--- localsys.h.orig Mon Feb 15 02:27:37 1999 ++++ localsys.h Thu Feb 18 11:09:40 1999 +@@ -13,13 +13,13 @@ + * func_type funcname P__((arglist)); + */ + +-#include "config.h" +- + #include + #include + #include + #include + #include ++ ++#include "config.h" + + #ifdef HAVE_UNISTD_H + #include Property changes on: head/security/super/files/patch-localsys.h_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/super/files/patch-localsys.h_2 =================================================================== --- head/security/super/files/patch-localsys.h_2 (nonexistent) +++ head/security/super/files/patch-localsys.h_2 (revision 363328) @@ -0,0 +1,9 @@ +--- localsys.h.orig Fri Jun 18 09:22:22 2004 ++++ localsys.h Fri Sep 3 10:52:44 2004 +@@ -295,4 +295,6 @@ + ++#ifndef __FreeBSD__ /* FBSD has a malloc.h that tells people to obey C89. */ + #ifdef HAVE_MALLOC_H + #include ++#endif + #endif Property changes on: head/security/super/files/patch-localsys.h_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-aa =================================================================== --- head/security/tripwire-131/files/patch-aa (revision 363327) +++ head/security/tripwire-131/files/patch-aa (nonexistent) @@ -1,38 +0,0 @@ -*** include/config.h.orig Fri Jul 15 06:02:52 1994 ---- include/config.h Sun Dec 31 18:56:20 1989 -*************** -*** 17,23 **** - *** file that corresponds with your operating system. - ***/ - -! #include "../configs/conf-svr4.h" - - #ifdef TW_TYPE32 - typedef TW_TYPE32 int32; ---- 17,23 ---- - *** file that corresponds with your operating system. - ***/ - -! #include "../configs/conf-freebsd2.h" - - #ifdef TW_TYPE32 - typedef TW_TYPE32 int32; -*************** -*** 103,110 **** - #endif - */ - -! #define CONFIG_PATH "/usr/local/bin/tw" -! #define DATABASE_PATH "/var/tripwire" - - /******* name of Tripwire files ************************************** - * ---- 103,110 ---- - #endif - */ - -! # define CONFIG_PATH "/var/adm/tcheck" -! # define DATABASE_PATH "/var/adm/tcheck/databases" - - /******* name of Tripwire files ************************************** - * Property changes on: head/security/tripwire-131/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-ab =================================================================== --- head/security/tripwire-131/files/patch-ab (revision 363327) +++ head/security/tripwire-131/files/patch-ab (nonexistent) @@ -1,50 +0,0 @@ ---- Makefile.orig 1999-05-04 01:31:00.000000000 -0700 -+++ Makefile 2014-06-07 22:43:39.000000000 -0700 -@@ -10,11 +10,9 @@ - ### - - # destination directory for final executables --DESTDIR = /usr/local/bin/tw --DATADIR = /var/tripwire - - # destination for man pages --MANDIR = /usr/man # This needs to change to reflect the path -+MANDIR = $(MANPREFIX)/man # This needs to change to reflect the path - # on your system - - # system utilities -@@ -33,7 +31,6 @@ - - # you can use ANSI C if you like, but K&R is equally fine. - #CC = cc # common --CC = gcc # also common - #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4) - - CFLAGS = -O # common -@@ -60,8 +57,8 @@ - #CPP = /lib/cpp # on older systems - - # make sure libraries are not linked dynamically (as a security measure) --#LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous --LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0 -+LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous -+#LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0 - # common - #LDFLAGS= -non_shared # OSF/1 - #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire -@@ -106,13 +103,9 @@ - YACC="$(YACC)" LEX="$(LEX)" all) - - install: all -- $(INSTALL) -d $(DESTDIR) -- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install) -+ $(INSTALL) -d $(BINDIR) -+ (cd src; make INSTALL=$(INSTALL) BINDIR=$(BINDIR) install) - (cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install) -- (cd configs; $(INSTALL) -m 444 tw.config $(DESTDIR)) -- chmod 555 $(DESTDIR) -- $(INSTALL) -m 0755 -d $(DATADIR) -- $(INSTALL) -m 444 tests/tw.db_TEST $(DATADIR) - - test: all - (cd tests; make HOSTNAME=$(HOSTNAME) DIST=$(DIST) SHELL=$(SHELL) \ Property changes on: head/security/tripwire-131/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-ac =================================================================== --- head/security/tripwire-131/files/patch-ac (revision 363327) +++ head/security/tripwire-131/files/patch-ac (nonexistent) @@ -1,16 +0,0 @@ -This patch eliminates a compiler warning about LITTLE_ENDIAN begin -redefined. - -*** sigs/sha/sha.c.orig Mon Jul 25 08:46:45 1994 ---- sigs/sha/sha.c Mon Mar 31 19:55:23 1997 -*************** -*** 47,52 **** ---- 47,54 ---- - #include "sha.h" - - #if BYTEORDER == 0x1234 -+ #undef BIG_ENDIAN -+ #undef LITTLE_ENDIAN - #define LITTLE_ENDIAN - #endif - Property changes on: head/security/tripwire-131/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-ad =================================================================== --- head/security/tripwire-131/files/patch-ad (revision 363327) +++ head/security/tripwire-131/files/patch-ad (nonexistent) @@ -1,13 +0,0 @@ ---- src/Makefile.orig Tue May 4 01:31:00 1999 -+++ src/Makefile Thu May 11 19:49:21 2000 -@@ -104,8 +104,8 @@ - $(CC) $(CFLAGS) -c $< - - install: tripwire -- $(INSTALL) -m 555 tripwire $(DESTDIR) -- $(INSTALL) -m 555 siggen $(DESTDIR) -+ $(INSTALL) -f noschg -s -m 555 tripwire $(BINDIR) -+ $(INSTALL) -f noschg -s -m 555 siggen $(BINDIR) - - clean: - -rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \ Property changes on: head/security/tripwire-131/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-ba =================================================================== --- head/security/tripwire-131/files/patch-ba (revision 363327) +++ head/security/tripwire-131/files/patch-ba (nonexistent) @@ -1,21 +0,0 @@ ---- src/config.parse.c.orig Tue Jun 13 23:24:14 2000 -+++ src/config.parse.c Tue Jun 13 23:30:35 2000 -@@ -55,7 +55,6 @@ - #endif - - /* prototypes */ --char *mktemp(); - static void configfile_descend(); - - #ifndef L_tmpnam -@@ -105,8 +104,8 @@ - }; - (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE); - -- if ((char *) mktemp(tmpfilename) == NULL) { -- perror("configfile_read: mktemp()"); -+ if (mkstemp(tmpfilename) == -1) { -+ perror("configfile_read: mkstemp()"); - exit(1); - } - Property changes on: head/security/tripwire-131/files/patch-ba ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-bb =================================================================== --- head/security/tripwire-131/files/patch-bb (revision 363327) +++ head/security/tripwire-131/files/patch-bb (nonexistent) @@ -1,32 +0,0 @@ ---- src/dbase.build.c.orig Tue May 4 17:31:00 1999 -+++ src/dbase.build.c Tue Jun 13 23:40:06 2000 -@@ -60,7 +60,6 @@ - int files_scanned_num = 0; - - /* prototypes */ --char *mktemp(); - - /* new database checking routines */ - static void database_record_write(); -@@ -135,8 +134,8 @@ - die_with_err("malloc() failed in database_build", (char *) NULL); - (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE); - -- if ((char *) mktemp(tmpfilename) == NULL) -- die_with_err("database_build: mktemp()", (char *) NULL); -+ if (mkstemp(tmpfilename) == -1) -+ die_with_err("database_build: mkstemp()", (char *) NULL); - - (void) strcpy(tempdatabase_file, tmpfilename); - (void) strcpy(database, tempdatabase_file); -@@ -814,8 +813,8 @@ - /* build temporary file name */ - (void) strcpy(backup_name, TEMPFILE_TEMPLATE); - -- if ((char *) mktemp(backup_name) == NULL) { -- die_with_err("copy_database_to_backup: mktemp() failed!", NULL); -+ if (mkstemp(backup_name) == -1) { -+ die_with_err("copy_database_to_backup: mkstemp() failed!", NULL); - } - - strcpy (database_backupfile, backup_name); Property changes on: head/security/tripwire-131/files/patch-bb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-bc =================================================================== --- head/security/tripwire-131/files/patch-bc (revision 363327) +++ head/security/tripwire-131/files/patch-bc (nonexistent) @@ -1,21 +0,0 @@ ---- src/siggen.c.orig Tue Jun 13 23:42:53 2000 -+++ src/siggen.c Tue Jun 13 23:43:27 2000 -@@ -52,7 +52,6 @@ - - extern int optind; - int debuglevel = 0; --char *mktemp(); - - int (*pf_signatures [NUM_SIGS]) () = { - SIG0FUNC, -@@ -172,8 +171,8 @@ - }; - (void) strcpy(tmpfilename, "/tmp/twzXXXXXX"); - -- if ((char *) mktemp(tmpfilename) == NULL) { -- perror("siggen: mktemp()"); -+ if (mkstemp(tmpfilename) == -1) { -+ perror("siggen: mkstemp()"); - exit(1); - } - Property changes on: head/security/tripwire-131/files/patch-bc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-bd =================================================================== --- head/security/tripwire-131/files/patch-bd (revision 363327) +++ head/security/tripwire-131/files/patch-bd (nonexistent) @@ -1,13 +0,0 @@ ---- src/utils.c.orig Tue Jun 13 23:43:01 2000 -+++ src/utils.c Tue Jun 13 23:43:50 2000 -@@ -856,8 +856,8 @@ - int fd; - - (void) strcpy(tmp, TEMPFILE_TEMPLATE); -- if ((char *) mktemp(tmp) == NULL) { -- perror("tempfilename_generate: mktemp()"); -+ if (mkstemp(tmp) == -1) { -+ perror("tempfilename_generate: mkstemp()"); - exit(1); - } - Property changes on: head/security/tripwire-131/files/patch-bd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-Makefile =================================================================== --- head/security/tripwire-131/files/patch-Makefile (nonexistent) +++ head/security/tripwire-131/files/patch-Makefile (revision 363328) @@ -0,0 +1,50 @@ +--- Makefile.orig 1999-05-04 01:31:00.000000000 -0700 ++++ Makefile 2014-06-07 22:43:39.000000000 -0700 +@@ -10,11 +10,9 @@ + ### + + # destination directory for final executables +-DESTDIR = /usr/local/bin/tw +-DATADIR = /var/tripwire + + # destination for man pages +-MANDIR = /usr/man # This needs to change to reflect the path ++MANDIR = $(MANPREFIX)/man # This needs to change to reflect the path + # on your system + + # system utilities +@@ -33,7 +31,6 @@ + + # you can use ANSI C if you like, but K&R is equally fine. + #CC = cc # common +-CC = gcc # also common + #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4) + + CFLAGS = -O # common +@@ -60,8 +57,8 @@ + #CPP = /lib/cpp # on older systems + + # make sure libraries are not linked dynamically (as a security measure) +-#LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous +-LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0 ++LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous ++#LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0 + # common + #LDFLAGS= -non_shared # OSF/1 + #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire +@@ -106,13 +103,9 @@ + YACC="$(YACC)" LEX="$(LEX)" all) + + install: all +- $(INSTALL) -d $(DESTDIR) +- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install) ++ $(INSTALL) -d $(BINDIR) ++ (cd src; make INSTALL=$(INSTALL) BINDIR=$(BINDIR) install) + (cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install) +- (cd configs; $(INSTALL) -m 444 tw.config $(DESTDIR)) +- chmod 555 $(DESTDIR) +- $(INSTALL) -m 0755 -d $(DATADIR) +- $(INSTALL) -m 444 tests/tw.db_TEST $(DATADIR) + + test: all + (cd tests; make HOSTNAME=$(HOSTNAME) DIST=$(DIST) SHELL=$(SHELL) \ Property changes on: head/security/tripwire-131/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-include-config.h =================================================================== --- head/security/tripwire-131/files/patch-include-config.h (nonexistent) +++ head/security/tripwire-131/files/patch-include-config.h (revision 363328) @@ -0,0 +1,38 @@ +*** include/config.h.orig Fri Jul 15 06:02:52 1994 +--- include/config.h Sun Dec 31 18:56:20 1989 +*************** +*** 17,23 **** + *** file that corresponds with your operating system. + ***/ + +! #include "../configs/conf-svr4.h" + + #ifdef TW_TYPE32 + typedef TW_TYPE32 int32; +--- 17,23 ---- + *** file that corresponds with your operating system. + ***/ + +! #include "../configs/conf-freebsd2.h" + + #ifdef TW_TYPE32 + typedef TW_TYPE32 int32; +*************** +*** 103,110 **** + #endif + */ + +! #define CONFIG_PATH "/usr/local/bin/tw" +! #define DATABASE_PATH "/var/tripwire" + + /******* name of Tripwire files ************************************** + * +--- 103,110 ---- + #endif + */ + +! # define CONFIG_PATH "/var/adm/tcheck" +! # define DATABASE_PATH "/var/adm/tcheck/databases" + + /******* name of Tripwire files ************************************** + * Property changes on: head/security/tripwire-131/files/patch-include-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-sigs-sha-sha.c =================================================================== --- head/security/tripwire-131/files/patch-sigs-sha-sha.c (nonexistent) +++ head/security/tripwire-131/files/patch-sigs-sha-sha.c (revision 363328) @@ -0,0 +1,16 @@ +This patch eliminates a compiler warning about LITTLE_ENDIAN begin +redefined. + +*** sigs/sha/sha.c.orig Mon Jul 25 08:46:45 1994 +--- sigs/sha/sha.c Mon Mar 31 19:55:23 1997 +*************** +*** 47,52 **** +--- 47,54 ---- + #include "sha.h" + + #if BYTEORDER == 0x1234 ++ #undef BIG_ENDIAN ++ #undef LITTLE_ENDIAN + #define LITTLE_ENDIAN + #endif + Property changes on: head/security/tripwire-131/files/patch-sigs-sha-sha.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-src-Makefile =================================================================== --- head/security/tripwire-131/files/patch-src-Makefile (nonexistent) +++ head/security/tripwire-131/files/patch-src-Makefile (revision 363328) @@ -0,0 +1,13 @@ +--- src/Makefile.orig Tue May 4 01:31:00 1999 ++++ src/Makefile Thu May 11 19:49:21 2000 +@@ -104,8 +104,8 @@ + $(CC) $(CFLAGS) -c $< + + install: tripwire +- $(INSTALL) -m 555 tripwire $(DESTDIR) +- $(INSTALL) -m 555 siggen $(DESTDIR) ++ $(INSTALL) -f noschg -s -m 555 tripwire $(BINDIR) ++ $(INSTALL) -f noschg -s -m 555 siggen $(BINDIR) + + clean: + -rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \ Property changes on: head/security/tripwire-131/files/patch-src-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-src-config.parse.c =================================================================== --- head/security/tripwire-131/files/patch-src-config.parse.c (nonexistent) +++ head/security/tripwire-131/files/patch-src-config.parse.c (revision 363328) @@ -0,0 +1,21 @@ +--- src/config.parse.c.orig Tue Jun 13 23:24:14 2000 ++++ src/config.parse.c Tue Jun 13 23:30:35 2000 +@@ -55,7 +55,6 @@ + #endif + + /* prototypes */ +-char *mktemp(); + static void configfile_descend(); + + #ifndef L_tmpnam +@@ -105,8 +104,8 @@ + }; + (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE); + +- if ((char *) mktemp(tmpfilename) == NULL) { +- perror("configfile_read: mktemp()"); ++ if (mkstemp(tmpfilename) == -1) { ++ perror("configfile_read: mkstemp()"); + exit(1); + } + Property changes on: head/security/tripwire-131/files/patch-src-config.parse.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-src-dbase.build.c =================================================================== --- head/security/tripwire-131/files/patch-src-dbase.build.c (nonexistent) +++ head/security/tripwire-131/files/patch-src-dbase.build.c (revision 363328) @@ -0,0 +1,32 @@ +--- src/dbase.build.c.orig Tue May 4 17:31:00 1999 ++++ src/dbase.build.c Tue Jun 13 23:40:06 2000 +@@ -60,7 +60,6 @@ + int files_scanned_num = 0; + + /* prototypes */ +-char *mktemp(); + + /* new database checking routines */ + static void database_record_write(); +@@ -135,8 +134,8 @@ + die_with_err("malloc() failed in database_build", (char *) NULL); + (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE); + +- if ((char *) mktemp(tmpfilename) == NULL) +- die_with_err("database_build: mktemp()", (char *) NULL); ++ if (mkstemp(tmpfilename) == -1) ++ die_with_err("database_build: mkstemp()", (char *) NULL); + + (void) strcpy(tempdatabase_file, tmpfilename); + (void) strcpy(database, tempdatabase_file); +@@ -814,8 +813,8 @@ + /* build temporary file name */ + (void) strcpy(backup_name, TEMPFILE_TEMPLATE); + +- if ((char *) mktemp(backup_name) == NULL) { +- die_with_err("copy_database_to_backup: mktemp() failed!", NULL); ++ if (mkstemp(backup_name) == -1) { ++ die_with_err("copy_database_to_backup: mkstemp() failed!", NULL); + } + + strcpy (database_backupfile, backup_name); Property changes on: head/security/tripwire-131/files/patch-src-dbase.build.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-src-siggen.c =================================================================== --- head/security/tripwire-131/files/patch-src-siggen.c (nonexistent) +++ head/security/tripwire-131/files/patch-src-siggen.c (revision 363328) @@ -0,0 +1,21 @@ +--- src/siggen.c.orig Tue Jun 13 23:42:53 2000 ++++ src/siggen.c Tue Jun 13 23:43:27 2000 +@@ -52,7 +52,6 @@ + + extern int optind; + int debuglevel = 0; +-char *mktemp(); + + int (*pf_signatures [NUM_SIGS]) () = { + SIG0FUNC, +@@ -172,8 +171,8 @@ + }; + (void) strcpy(tmpfilename, "/tmp/twzXXXXXX"); + +- if ((char *) mktemp(tmpfilename) == NULL) { +- perror("siggen: mktemp()"); ++ if (mkstemp(tmpfilename) == -1) { ++ perror("siggen: mkstemp()"); + exit(1); + } + Property changes on: head/security/tripwire-131/files/patch-src-siggen.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire-131/files/patch-src-utils.c =================================================================== --- head/security/tripwire-131/files/patch-src-utils.c (nonexistent) +++ head/security/tripwire-131/files/patch-src-utils.c (revision 363328) @@ -0,0 +1,13 @@ +--- src/utils.c.orig Tue Jun 13 23:43:01 2000 ++++ src/utils.c Tue Jun 13 23:43:50 2000 +@@ -856,8 +856,8 @@ + int fd; + + (void) strcpy(tmp, TEMPFILE_TEMPLATE); +- if ((char *) mktemp(tmp) == NULL) { +- perror("tempfilename_generate: mktemp()"); ++ if (mkstemp(tmp) == -1) { ++ perror("tempfilename_generate: mkstemp()"); + exit(1); + } + Property changes on: head/security/tripwire-131/files/patch-src-utils.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-aa =================================================================== --- head/security/tripwire12/files/patch-aa (revision 363327) +++ head/security/tripwire12/files/patch-aa (nonexistent) @@ -1,38 +0,0 @@ -*** include/config.h.orig Fri Jul 15 06:02:52 1994 ---- include/config.h Sun Dec 31 18:56:20 1989 -*************** -*** 17,23 **** - *** file that corresponds with your operating system. - ***/ - -! #include "../configs/conf-svr4.h" - - #ifdef TW_TYPE32 - typedef TW_TYPE32 int32; ---- 17,23 ---- - *** file that corresponds with your operating system. - ***/ - -! #include "../configs/conf-freebsd8.h" - - #ifdef TW_TYPE32 - typedef TW_TYPE32 int32; -*************** -*** 103,110 **** - #endif - */ - -! #define CONFIG_PATH "/tmp/genek" -! #define DATABASE_PATH "/tmp/genek" - - /******* name of Tripwire files ************************************** - * ---- 103,110 ---- - #endif - */ - -! # define CONFIG_PATH "/var/adm/tcheck" -! # define DATABASE_PATH "/var/adm/tcheck/databases" - - /******* name of Tripwire files ************************************** - * Property changes on: head/security/tripwire12/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-ab =================================================================== --- head/security/tripwire12/files/patch-ab (revision 363327) +++ head/security/tripwire12/files/patch-ab (nonexistent) @@ -1,46 +0,0 @@ ---- Makefile.orig 2014-06-09 12:38:51.784239761 -0700 -+++ Makefile 2014-06-09 12:43:05.345562324 -0700 -@@ -12,10 +12,8 @@ - ### - - # destination directory for final executables --DESTDIR = /secureplace/bin - - # destination for man pages --MANDIR = /usr/man - - # system utilities - LEX = lex -@@ -32,11 +30,11 @@ - #SHELL = /bin/bash # For the GNU fanatics - - # you can use ANSI C if you like, but K&R is equally fine. --CC = cc # common -+#CC = cc # common - #CC = gcc # also common - #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4) - --CFLAGS = -O # common -+#CFLAGS = -O # common - #CFLAGS = -g # common - #CFLAGS = -g # debugging - #CFLAGS = -O -cckr # SGI -@@ -60,7 +58,8 @@ - #CPP = /lib/cpp # on older systems - - # make sure libraries are not linked dynamically (as a security measure) --LDFLAGS= # common -+LDFLAGS= -static -+#LDFLAGS= # common - #LDFLAGS= -non_shared # OSF/1 - #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire - # on Solaris 2.3) -@@ -103,7 +102,7 @@ - YACC="$(YACC)" LEX="$(LEX)" all) - - install: all -- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install) -+ (cd src; make INSTALL=$(INSTALL) DESTDIR=$(BINDIR) install) - (cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install) - - test: all Property changes on: head/security/tripwire12/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-ac =================================================================== --- head/security/tripwire12/files/patch-ac (revision 363327) +++ head/security/tripwire12/files/patch-ac (nonexistent) @@ -1,16 +0,0 @@ -This patch eliminates a compiler warning about LITTLE_ENDIAN begin -redefined. - -*** sigs/sha/sha.c.orig Mon Jul 25 08:46:45 1994 ---- sigs/sha/sha.c Mon Mar 31 19:55:23 1997 -*************** -*** 47,52 **** ---- 47,54 ---- - #include "sha.h" - - #if BYTEORDER == 0x1234 -+ #undef BIG_ENDIAN -+ #undef LITTLE_ENDIAN - #define LITTLE_ENDIAN - #endif - Property changes on: head/security/tripwire12/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-Makefile =================================================================== --- head/security/tripwire12/files/patch-Makefile (nonexistent) +++ head/security/tripwire12/files/patch-Makefile (revision 363328) @@ -0,0 +1,46 @@ +--- Makefile.orig 2014-06-09 12:38:51.784239761 -0700 ++++ Makefile 2014-06-09 12:43:05.345562324 -0700 +@@ -12,10 +12,8 @@ + ### + + # destination directory for final executables +-DESTDIR = /secureplace/bin + + # destination for man pages +-MANDIR = /usr/man + + # system utilities + LEX = lex +@@ -32,11 +30,11 @@ + #SHELL = /bin/bash # For the GNU fanatics + + # you can use ANSI C if you like, but K&R is equally fine. +-CC = cc # common ++#CC = cc # common + #CC = gcc # also common + #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4) + +-CFLAGS = -O # common ++#CFLAGS = -O # common + #CFLAGS = -g # common + #CFLAGS = -g # debugging + #CFLAGS = -O -cckr # SGI +@@ -60,7 +58,8 @@ + #CPP = /lib/cpp # on older systems + + # make sure libraries are not linked dynamically (as a security measure) +-LDFLAGS= # common ++LDFLAGS= -static ++#LDFLAGS= # common + #LDFLAGS= -non_shared # OSF/1 + #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire + # on Solaris 2.3) +@@ -103,7 +102,7 @@ + YACC="$(YACC)" LEX="$(LEX)" all) + + install: all +- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install) ++ (cd src; make INSTALL=$(INSTALL) DESTDIR=$(BINDIR) install) + (cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install) + + test: all Property changes on: head/security/tripwire12/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-include-config.h =================================================================== --- head/security/tripwire12/files/patch-include-config.h (nonexistent) +++ head/security/tripwire12/files/patch-include-config.h (revision 363328) @@ -0,0 +1,38 @@ +*** include/config.h.orig Fri Jul 15 06:02:52 1994 +--- include/config.h Sun Dec 31 18:56:20 1989 +*************** +*** 17,23 **** + *** file that corresponds with your operating system. + ***/ + +! #include "../configs/conf-svr4.h" + + #ifdef TW_TYPE32 + typedef TW_TYPE32 int32; +--- 17,23 ---- + *** file that corresponds with your operating system. + ***/ + +! #include "../configs/conf-freebsd8.h" + + #ifdef TW_TYPE32 + typedef TW_TYPE32 int32; +*************** +*** 103,110 **** + #endif + */ + +! #define CONFIG_PATH "/tmp/genek" +! #define DATABASE_PATH "/tmp/genek" + + /******* name of Tripwire files ************************************** + * +--- 103,110 ---- + #endif + */ + +! # define CONFIG_PATH "/var/adm/tcheck" +! # define DATABASE_PATH "/var/adm/tcheck/databases" + + /******* name of Tripwire files ************************************** + * Property changes on: head/security/tripwire12/files/patch-include-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/tripwire12/files/patch-sigs-sha-sha.c =================================================================== --- head/security/tripwire12/files/patch-sigs-sha-sha.c (nonexistent) +++ head/security/tripwire12/files/patch-sigs-sha-sha.c (revision 363328) @@ -0,0 +1,16 @@ +This patch eliminates a compiler warning about LITTLE_ENDIAN begin +redefined. + +*** sigs/sha/sha.c.orig Mon Jul 25 08:46:45 1994 +--- sigs/sha/sha.c Mon Mar 31 19:55:23 1997 +*************** +*** 47,52 **** +--- 47,54 ---- + #include "sha.h" + + #if BYTEORDER == 0x1234 ++ #undef BIG_ENDIAN ++ #undef LITTLE_ENDIAN + #define LITTLE_ENDIAN + #endif + Property changes on: head/security/tripwire12/files/patch-sigs-sha-sha.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/vida/files/patch-aa =================================================================== --- head/security/vida/files/patch-aa (revision 363327) +++ head/security/vida/files/patch-aa (nonexistent) @@ -1,18 +0,0 @@ ---- include.h.orig Thu Apr 17 11:36:06 2003 -+++ include.h Thu Apr 17 11:36:19 2003 -@@ -24,13 +24,13 @@ - * * - \*____________________________________________*/ - --#include - #include -+#include - #include - #include - #include - #include --#include -+#include - #include - #include - #include Property changes on: head/security/vida/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/vida/files/patch-include.h =================================================================== --- head/security/vida/files/patch-include.h (nonexistent) +++ head/security/vida/files/patch-include.h (revision 363328) @@ -0,0 +1,18 @@ +--- include.h.orig Thu Apr 17 11:36:06 2003 ++++ include.h Thu Apr 17 11:36:19 2003 +@@ -24,13 +24,13 @@ + * * + \*____________________________________________*/ + +-#include + #include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include Property changes on: head/security/vida/files/patch-include.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/zebedee/Makefile =================================================================== --- head/security/zebedee/Makefile (revision 363327) +++ head/security/zebedee/Makefile (revision 363328) @@ -1,50 +1,46 @@ # Created by: Greg Hewgill # $FreeBSD$ PORTNAME= zebedee PORTVERSION= 2.5.3 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Encrypted, secure compressed TCP tunnel USES= perl5 USE_OPENSSL= yes USE_PERL5= build MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} EXAMPLES= vncviewer.zbd vncserver.zbd server.key server.id client1.key \ client2.key clients.id DOCS= README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES -.include - post-patch: @${REINPLACE_CMD} \ -e 's| gcc| ${CC}|' \ ${BUILD_WRKSRC}/${MAKEFILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zebedee ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/ftpgw.tcl ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/server.zbd ${STAGEDIR}${PREFIX}/etc/server.zbd.sample ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for e in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${e} ${STAGEDIR}${EXAMPLESDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/security/zebedee/files/patch-aa =================================================================== --- head/security/zebedee/files/patch-aa (revision 363327) +++ head/security/zebedee/files/patch-aa (nonexistent) @@ -1,87 +0,0 @@ ---- Makefile.orig Tue Sep 6 07:59:53 2005 -+++ Makefile Thu Sep 15 07:34:55 2005 -@@ -5,7 +5,7 @@ - - ZBD_VERSION = 2.5.3 - --OS = -+OS = freebsd - - ### - ### Locations of tools, libraries and installation directories. -@@ -14,13 +14,11 @@ - - # Choose your C compiler - --CC_$(OS) = gcc -- - CC_win32 = gcc -mno-cygwin - CC_linux = gcc -pthread - CC_linux64 = $(CC_linux) -m64 - CC_solaris = gcc --CC_freebsd = gcc -pthread -+CC_freebsd ?= gcc - CC_tru64 = cc - CC_irix = cc -n32 -woff 1110 - CC_hpux = cc -Ae +DAportable -@@ -31,7 +29,7 @@ - # Optimise/debug compilation - - #OPTIM = -Wall -g --OPTIM = -Wall -O3 -+OPTIM = -Wall - - # Location of gmp include and library - # -@@ -46,25 +44,26 @@ - # BFINC = /usr/include/openssl - # BFLIB = -lcrypto - --BFINC = -I../blowfish-0.9.5a --BFLIB = ../blowfish-0.9.5a/libblowfish.a -+BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl -+BFLIB = $(OPENSSLLIB)/libcrypto.a - - # Location of zlib include and library - --ZINC = -I../zlib-1.2.3 --ZLIB = ../zlib-1.2.3/libz.a -+ZINC = -+ZLIB = -lz - - # Location of bzlib include and library - # Set these empty if you don't want bzib2 support - --BZINC = -I../bzip2-1.0.3 --BZLIB = ../bzip2-1.0.3/libbz2.a -+BZINC = -I$(LOCALBASE)/include -+BZLIB = -L$(LOCALBASE)/lib -lbz2 - - # - # Tools needed for Perl "POD"-format documentation conversion. - # - PERL_$(OS) = perl - PERL_win32 = c:/perl/bin/perl # Avoid Cygwin port -+PERL_freebsd = perl - PERL = $(PERL_$(OS)) - - BAT_win32 = .bat -@@ -186,7 +185,8 @@ - #### You REALLY shouldn't have to modify anything beyond here ... - #### - --CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) -+CFLAGS ?= -03 -+CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) - - LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) - -@@ -206,7 +206,7 @@ - @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi - - zebedee$(EXE) : $(OBJS) -- $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS) - - huge.o : huge.h - Property changes on: head/security/zebedee/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/zebedee/files/patch-Makefile =================================================================== --- head/security/zebedee/files/patch-Makefile (nonexistent) +++ head/security/zebedee/files/patch-Makefile (revision 363328) @@ -0,0 +1,87 @@ +--- Makefile.orig Tue Sep 6 07:59:53 2005 ++++ Makefile Thu Sep 15 07:34:55 2005 +@@ -5,7 +5,7 @@ + + ZBD_VERSION = 2.5.3 + +-OS = ++OS = freebsd + + ### + ### Locations of tools, libraries and installation directories. +@@ -14,13 +14,11 @@ + + # Choose your C compiler + +-CC_$(OS) = gcc +- + CC_win32 = gcc -mno-cygwin + CC_linux = gcc -pthread + CC_linux64 = $(CC_linux) -m64 + CC_solaris = gcc +-CC_freebsd = gcc -pthread ++CC_freebsd ?= gcc + CC_tru64 = cc + CC_irix = cc -n32 -woff 1110 + CC_hpux = cc -Ae +DAportable +@@ -31,7 +29,7 @@ + # Optimise/debug compilation + + #OPTIM = -Wall -g +-OPTIM = -Wall -O3 ++OPTIM = -Wall + + # Location of gmp include and library + # +@@ -46,25 +44,26 @@ + # BFINC = /usr/include/openssl + # BFLIB = -lcrypto + +-BFINC = -I../blowfish-0.9.5a +-BFLIB = ../blowfish-0.9.5a/libblowfish.a ++BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl ++BFLIB = $(OPENSSLLIB)/libcrypto.a + + # Location of zlib include and library + +-ZINC = -I../zlib-1.2.3 +-ZLIB = ../zlib-1.2.3/libz.a ++ZINC = ++ZLIB = -lz + + # Location of bzlib include and library + # Set these empty if you don't want bzib2 support + +-BZINC = -I../bzip2-1.0.3 +-BZLIB = ../bzip2-1.0.3/libbz2.a ++BZINC = -I$(LOCALBASE)/include ++BZLIB = -L$(LOCALBASE)/lib -lbz2 + + # + # Tools needed for Perl "POD"-format documentation conversion. + # + PERL_$(OS) = perl + PERL_win32 = c:/perl/bin/perl # Avoid Cygwin port ++PERL_freebsd = perl + PERL = $(PERL_$(OS)) + + BAT_win32 = .bat +@@ -186,7 +185,8 @@ + #### You REALLY shouldn't have to modify anything beyond here ... + #### + +-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) ++CFLAGS ?= -03 ++CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) + + LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) + +@@ -206,7 +206,7 @@ + @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi + + zebedee$(EXE) : $(OBJS) +- $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS) + + huge.o : huge.h + Property changes on: head/security/zebedee/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/zebedee/pkg-plist =================================================================== --- head/security/zebedee/pkg-plist (revision 363327) +++ head/security/zebedee/pkg-plist (revision 363328) @@ -1,19 +1,19 @@ bin/ftpgw.tcl bin/zebedee etc/server.zbd.sample man/man1/ftpgw.tcl.1.gz man/man1/zebedee.1.gz -%%EXAMPLESDIR%%/client1.key -%%EXAMPLESDIR%%/client2.key -%%EXAMPLESDIR%%/clients.id -%%EXAMPLESDIR%%/server.id -%%EXAMPLESDIR%%/server.key -%%EXAMPLESDIR%%/vncserver.zbd -%%EXAMPLESDIR%%/vncviewer.zbd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client1.key +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client2.key +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clients.id +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.id +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.key +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncserver.zbd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncviewer.zbd %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt %%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html %%PORTDOCS%%%%DOCSDIR%%/zebedee.html -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%