Index: head/security/l0pht-watch/files/patch-aa =================================================================== --- head/security/l0pht-watch/files/patch-aa (revision 27990) +++ head/security/l0pht-watch/files/patch-aa (revision 27991) @@ -1,28 +1,28 @@ --- Makefile.orig Thu Sep 23 10:18:18 1999 -+++ Makefile Sat Dec 4 00:53:05 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='-DBSD -DREGEX -DREGCOMP_3C' CC="$(CC) $(CFLAGS)" \ ++ XFLAGS='-DREGEX -DREGCOMP_3C' CC="$(CC) $(CFLAGS)" \ + STATIC=-static generic: make -e $(ALL) $(MFLAGS) \ Property changes on: head/security/l0pht-watch/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ab =================================================================== --- head/security/l0pht-watch/files/patch-ab (nonexistent) +++ head/security/l0pht-watch/files/patch-ab (revision 27991) @@ -0,0 +1,74 @@ +--- check_tmp.c.orig Fri Sep 24 13:33:35 1999 ++++ check_tmp.c Tue Apr 25 00:57:56 2000 +@@ -38,6 +38,13 @@ + #endif + #endif + ++#if __FreeBSD_version >= 500001 ++ struct kevent ev; ++ struct kevent *evp; ++ int fd; ++ struct timespec ts = { 0, 0 }; ++ int kq = -1; ++#endif + + struct listStruct *list = NULL; + +@@ -178,6 +185,22 @@ + exit(1); + } + ++#if __FreeBSD_version >= 500001 ++ /* 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; ++ evp = &ev; ++ kevent(kq, 1, &evp, 0, NULL, &ts); ++#endif ++ + /* steup the first element of the list */ + while ((dp = readdir(dirp)) != NULL){ + if (!list) /* first time */ +@@ -266,6 +289,10 @@ + rewinddir(dirp); + + while (1){ ++ ++#if __FreeBSD_version >= 500001 ++ if (ev.fflags & NOTE_WRITE) { ++#endif + while ((dp = readdir(dirp)) != NULL){ + if (!(checknode(list, watchdir, dp->d_name))){ + if (replacewatchflag){ +@@ -352,11 +379,22 @@ + /* closedir(dirp); */ + } + } +-#ifdef 0 ++#if 0 + walklist(list); + #endif + list = prunelist(list); + rewinddir(dirp); ++ ++#if __FreeBSD_version >= 500001 ++ /* Reset event so we don't trigger on the rewinddir */ ++ kevent(kq, 1, &evp, 0, NULL, &ts); ++ ++ /* Block until the directory changes */ ++ if (kevent(kq, 0, NULL, 1, &ev, NULL) < 0) ++ err(1, "kevent"); ++ ++ } ++#endif + } + /* closedir(dirp); */ + Property changes on: head/security/l0pht-watch/files/patch-ab ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ac =================================================================== --- head/security/l0pht-watch/files/patch-ac (nonexistent) +++ head/security/l0pht-watch/files/patch-ac (revision 27991) @@ -0,0 +1,30 @@ +--- check_tmp.h.orig Thu Dec 24 07:40:13 1998 ++++ check_tmp.h Tue Apr 25 00:29:52 2000 +@@ -1,16 +1,22 @@ + #ifndef __CHECK_TMP_H + #define __CHECK_TMP_H + +-#include +-#include + #include ++#include + #include ++#include + #include +-#include +-#include + #include +-#include ++#include ++#include ++#include ++#include + #include ++#if __FreeBSD_version >= 500001 ++#include ++#include ++#include ++#endif + + #if defined (REGEXPR_3G) + #include Property changes on: head/security/l0pht-watch/files/patch-ac ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/l0pht-watch/files/patch-ad =================================================================== --- head/security/l0pht-watch/files/patch-ad (nonexistent) +++ head/security/l0pht-watch/files/patch-ad (revision 27991) @@ -0,0 +1,11 @@ +--- list_utils.c.orig Tue Apr 25 00:58:27 2000 ++++ list_utils.c Tue Apr 25 00:58:33 2000 +@@ -168,7 +168,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 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property