[Midnightbsd-cvs] mports [22514] update patchset for fam
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 23 18:07:10 EDT 2017
Revision: 22514
http://svnweb.midnightbsd.org/mports/?rev=22514
Author: laffer1
Date: 2017-09-23 18:07:09 -0400 (Sat, 23 Sep 2017)
Log Message:
-----------
update patchset for fam
Modified Paths:
--------------
trunk/devel/fam/Makefile
trunk/devel/fam/files/mntent_compat.c++
trunk/devel/fam/files/patch-configure.in
trunk/devel/fam/files/patch-include__BTree.h
Added Paths:
-----------
trunk/devel/fam/files/patch-Makefile.am
trunk/devel/fam/files/patch-fam_NFSFileSystem.c++
trunk/devel/fam/files/patch-fam__Directory.c++
trunk/devel/fam/files/patch-fam__DirectoryScanner.c++
trunk/devel/fam/files/patch-fam__DirectoryScanner.h
trunk/devel/fam/files/patch-fam__FileSystem.c++
trunk/devel/fam/files/patch-fam__FileSystemTable.c++
trunk/devel/fam/files/patch-fam__IMon.c++
trunk/devel/fam/files/patch-fam__Listener.c++
trunk/devel/fam/files/patch-fam__Log.c++
trunk/devel/fam/files/patch-fam__Makefile.am
trunk/devel/fam/files/patch-fam__SmallTable.h
trunk/devel/fam/files/patch-fam__StringTable.h
trunk/devel/fam/files/patch-libfam__Client.c++
Removed Paths:
-------------
trunk/devel/fam/files/patch-fam-Listener.c++
trunk/devel/fam/files/patch-fam-Log.c++
trunk/devel/fam/files/patch-fam::SmallTable.h
trunk/devel/fam/files/patch-fam_Directory.c++
trunk/devel/fam/files/patch-fam_DirectoryScanner.c++
trunk/devel/fam/files/patch-fam_DirectoryScanner.h
trunk/devel/fam/files/patch-fam_FileSystem.c++
trunk/devel/fam/files/patch-fam_FileSystemTable.c++
trunk/devel/fam/files/patch-fam_Makefile.am
trunk/devel/fam/files/patch-fam_StringTable.h
Property Changed:
----------------
trunk/devel/fam/files/mntent.h
trunk/devel/fam/files/mntent_compat.c++
trunk/devel/fam/files/patch-configure.in
trunk/devel/fam/files/patch-include__BTree.h
trunk/devel/fam/files/pkg-message.in
Modified: trunk/devel/fam/Makefile
===================================================================
--- trunk/devel/fam/Makefile 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/Makefile 2017-09-23 22:07:09 UTC (rev 22514)
@@ -3,7 +3,7 @@
PORTNAME= fam
PORTVERSION= 2.6.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/
DIST_SUBDIR= ${PORTNAME}
@@ -11,15 +11,16 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= File alteration monitor
-LICENSE= gpl2
+LICENSE= gpl2 lgpl2.1
+LICENSE_COMB= multi
CFLAGS+= -Wno-deprecated
-USES= gmake libtool
-USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake
-AUTOMAKE_ARGS= -a -c -f
+USES= autoreconf cpe gmake libtool
+CPE_VENDOR= sgi
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+GNU_CONFIGURE= yes
SUB_FILES= pkg-message
#CONFLICTS_INSTALL= gamin-[0-9]*
Index: trunk/devel/fam/files/mntent.h
===================================================================
--- trunk/devel/fam/files/mntent.h 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/mntent.h 2017-09-23 22:07:09 UTC (rev 22514)
Property changes on: trunk/devel/fam/files/mntent.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/fam/files/mntent_compat.c++
===================================================================
--- trunk/devel/fam/files/mntent_compat.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/mntent_compat.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -61,7 +61,7 @@
{ MNT_SYNCHRONOUS, "sync"},
{ MNT_UNION, "union"},
{ MNT_NOCLUSTERR, "noclusterr"},
- { MNT_NOCLUSTERW, "noclusterw"},
+ { static_cast<int>(MNT_NOCLUSTERW), "noclusterw"},
{ MNT_SUIDDIR, "suiddir"},
#ifdef MNT_SNAPSHOT
{ MNT_SNAPSHOT, "snapshot"},
Property changes on: trunk/devel/fam/files/mntent_compat.c++
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/devel/fam/files/patch-Makefile.am
===================================================================
--- trunk/devel/fam/files/patch-Makefile.am (rev 0)
+++ trunk/devel/fam/files/patch-Makefile.am 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,40 @@
+--- ./Makefile.am.orig 2003-04-15 06:20:33.000000000 +0200
++++ ./Makefile.am 2014-01-03 02:35:10.000000000 +0100
+@@ -1,36 +1,3 @@
+ include $(top_srcdir)/common.am
+
+-SUBDIRS = util include support libfam fam man test build
+-
+-EXTRA_DIST = common.am INSTALL.rpm
+-
+-rpm: dist
+- @cd build && $(MAKE) $(AM_MAKEFLAGS) rpm
+-
+-# We proceed even if these commands fail because this might be an install
+-# into $DESTDIR by a non-root user.
+-install-exec-hook:
+- - at if test "no$(LDCONFIG)" != "no"; then \
+-## echo "Adding $(libdir) to ld.so.conf..."; \
+- $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
+- exec $(LDCONFIG); \
+- fi
+-## @echo "Adding fam to rpc..."
+- -@$(EDITCONF) rpc add 391002 "sgi_fam 391002"
+-## @echo "Adding fam to inetd.conf..."
+- -@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
+- "# fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \
+- "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
+- @echo "Restarting inetd..."
+- - at killall -HUP inetd
+-
+-# We don't remove $(libdir) from ld.so.conf here because we don't have
+-# a way to tell whether we're the ones who added it, and other things
+-# probably use it as well.
+-uninstall-local:
+-## @echo "Removing fam from rpc..."
+- -@$(EDITCONF) rpc remove 391002
+-## @echo "Removing fam from inetd.conf..."
+- -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
+- @echo "Restarting inetd..."
+- - at killall -HUP inetd
++SUBDIRS = include support libfam fam man test build
Property changes on: trunk/devel/fam/files/patch-Makefile.am
___________________________________________________________________
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
Modified: trunk/devel/fam/files/patch-configure.in
===================================================================
--- trunk/devel/fam/files/patch-configure.in 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-configure.in 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,5 +1,5 @@
---- configure.in.orig Fri Aug 11 22:23:19 2006
-+++ configure.in Fri Aug 11 22:24:34 2006
+--- ./configure.in.orig 2003-04-15 08:05:00.000000000 +0200
++++ ./configure.in 2014-01-03 02:35:10.000000000 +0100
@@ -308,11 +308,6 @@
dnl If we don't have MNTTYPE_NFS , we croak.
dnl
Property changes on: trunk/devel/fam/files/patch-configure.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/fam/files/patch-fam-Listener.c++
===================================================================
--- trunk/devel/fam/files/patch-fam-Listener.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam-Listener.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,22 +0,0 @@
---- fam/Listener.c++.orig Tue Apr 15 13:52:40 2003
-+++ fam/Listener.c++ Thu Jan 11 05:28:45 2007
-@@ -36,6 +36,10 @@
- #include <sys/stat.h>
- #include <sys/un.h>
- #include <unistd.h>
-+#ifdef __FreeBSD__
-+#include <stdio.h>
-+#include <stdlib.h>
-+#endif // __FreeBSD__
-
- #include <errno.h>
-
-@@ -203,7 +207,7 @@
- // requested user and pass the name back to the client.
-
- // Unset TMPDIR to ensure that tempnam() works as desired
-- putenv("TMPDIR=");
-+ unsetenv("TMPDIR");
-
- char *tmpfile = tempnam("/tmp", ".fam");
- #if defined(__FreeBSD__)
Deleted: trunk/devel/fam/files/patch-fam-Log.c++
===================================================================
--- trunk/devel/fam/files/patch-fam-Log.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam-Log.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,13 +0,0 @@
---- fam/Log.c++~ Tue Jul 16 02:16:14 2002
-+++ fam/Log.c++ Tue Sep 3 19:56:25 2002
-@@ -28,9 +28,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
--#include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
- #ifdef HAVE_AUDIT
Deleted: trunk/devel/fam/files/patch-fam::SmallTable.h
===================================================================
--- trunk/devel/fam/files/patch-fam::SmallTable.h 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam::SmallTable.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,11 +0,0 @@
---- fam/SmallTable.h.orig Tue Jul 16 14:23:25 2002
-+++ fam/SmallTable.h Sat Jul 31 13:14:09 2004
-@@ -98,7 +98,7 @@
- }
-
- template <class Tkey, class Tvalue>
--SmallTable<Tkey, Tvalue>::Closure
-+typename SmallTable<Tkey, Tvalue>::Closure
- SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
- {
- unsigned l = 0, r = n;
Deleted: trunk/devel/fam/files/patch-fam_Directory.c++
===================================================================
--- trunk/devel/fam/files/patch-fam_Directory.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_Directory.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,11 +0,0 @@
---- fam/Directory.c++.orig Tue Apr 15 10:21:29 2003
-+++ fam/Directory.c++ Sat Aug 12 00:10:16 2006
-@@ -26,7 +26,7 @@
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
Deleted: trunk/devel/fam/files/patch-fam_DirectoryScanner.c++
===================================================================
--- trunk/devel/fam/files/patch-fam_DirectoryScanner.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_DirectoryScanner.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,11 +0,0 @@
---- fam/DirectoryScanner.c++.orig Sat Aug 12 00:12:06 2006
-+++ fam/DirectoryScanner.c++ Sat Aug 12 00:13:23 2006
-@@ -100,7 +100,7 @@
-
- while (dir && ready)
- {
-- struct direct *dp = readdir(dir);
-+ struct dirent *dp = readdir(dir);
- if (dp == NULL)
- { closedir(dir);
- dir = NULL;
Deleted: trunk/devel/fam/files/patch-fam_DirectoryScanner.h
===================================================================
--- trunk/devel/fam/files/patch-fam_DirectoryScanner.h 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_DirectoryScanner.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,11 +0,0 @@
---- fam/DirectoryScanner.h.orig Tue Apr 15 10:21:30 2003
-+++ fam/DirectoryScanner.h Sat Aug 12 00:10:29 2006
-@@ -27,7 +27,7 @@
-
- #include <stddef.h>
- #include <sys/types.h>
--#include <sys/dir.h>
-+#include <dirent.h>
-
- #include "Event.h"
-
Deleted: trunk/devel/fam/files/patch-fam_FileSystem.c++
===================================================================
--- trunk/devel/fam/files/patch-fam_FileSystem.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_FileSystem.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,11 +0,0 @@
---- fam/FileSystem.c++.orig Fri Aug 11 22:26:04 2006
-+++ fam/FileSystem.c++ Fri Aug 11 22:26:26 2006
-@@ -22,7 +22,7 @@
-
- #include "FileSystem.h"
-
--#include <mntent.h>
-+#include "mntent.h"
- #include <string.h>
-
- #include "Event.h"
Deleted: trunk/devel/fam/files/patch-fam_FileSystemTable.c++
===================================================================
--- trunk/devel/fam/files/patch-fam_FileSystemTable.c++ 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_FileSystemTable.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,10 +0,0 @@
---- fam/FileSystemTable.c++.orig Fri Aug 11 22:27:15 2006
-+++ fam/FileSystemTable.c++ Fri Aug 11 22:28:29 2006
-@@ -255,7 +255,6 @@
- // create_fs_by_name initializes our "root" member variable.
- if (!fs_by_name)
- { create_fs_by_name();
-- mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL);
- }
-
- cr.become_user();
Deleted: trunk/devel/fam/files/patch-fam_Makefile.am
===================================================================
--- trunk/devel/fam/files/patch-fam_Makefile.am 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_Makefile.am 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,10 +0,0 @@
---- fam/Makefile.am.orig Fri Aug 11 22:29:03 2006
-+++ fam/Makefile.am Fri Aug 11 22:29:18 2006
-@@ -72,6 +72,7 @@
- main.c++ \
- timeval.c++ \
- timeval.h \
-+ mntent_compat.c++ \
- @IMON_FUNCS at .c++
-
- EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
Added: trunk/devel/fam/files/patch-fam_NFSFileSystem.c++
===================================================================
--- trunk/devel/fam/files/patch-fam_NFSFileSystem.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam_NFSFileSystem.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- fam/NFSFileSystem.c++.orig 2003-04-15 04:21:38 UTC
++++ fam/NFSFileSystem.c++
+@@ -97,7 +97,7 @@ NFSFileSystem::NFSFileSystem(const mnten
+
+ attr_cache_timeout = ACREGMAX;
+
+- char * p;
++ const char * p;
+
+ if (strstr(opt, "noac")) {
+ f_noac = true;
Property changes on: trunk/devel/fam/files/patch-fam_NFSFileSystem.c++
___________________________________________________________________
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
Deleted: trunk/devel/fam/files/patch-fam_StringTable.h
===================================================================
--- trunk/devel/fam/files/patch-fam_StringTable.h 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-fam_StringTable.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,10 +0,0 @@
---- fam/StringTable.h.orig Fri Aug 11 22:29:55 2006
-+++ fam/StringTable.h Fri Aug 11 22:30:12 2006
-@@ -25,6 +25,7 @@
-
- #include <assert.h>
- #include <string.h>
-+#include "mntent.h"
-
- // A StringTable maps C strings onto values. It is a cheap O(n)
- // implementation, suitable only for small tables that are
Added: trunk/devel/fam/files/patch-fam__Directory.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__Directory.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__Directory.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/Directory.c++.orig 2003-04-15 06:21:29.000000000 +0200
++++ ./fam/Directory.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
Property changes on: trunk/devel/fam/files/patch-fam__Directory.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__DirectoryScanner.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__DirectoryScanner.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__DirectoryScanner.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/DirectoryScanner.c++.orig 2003-04-15 06:21:30.000000000 +0200
++++ ./fam/DirectoryScanner.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -100,7 +100,7 @@
+
+ while (dir && ready)
+ {
+- struct direct *dp = readdir(dir);
++ struct dirent *dp = readdir(dir);
+ if (dp == NULL)
+ { closedir(dir);
+ dir = NULL;
Property changes on: trunk/devel/fam/files/patch-fam__DirectoryScanner.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__DirectoryScanner.h
===================================================================
--- trunk/devel/fam/files/patch-fam__DirectoryScanner.h (rev 0)
+++ trunk/devel/fam/files/patch-fam__DirectoryScanner.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/DirectoryScanner.h.orig 2003-04-15 06:21:30.000000000 +0200
++++ ./fam/DirectoryScanner.h 2014-01-03 02:35:10.000000000 +0100
+@@ -27,7 +27,7 @@
+
+ #include <stddef.h>
+ #include <sys/types.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+
+ #include "Event.h"
+
Property changes on: trunk/devel/fam/files/patch-fam__DirectoryScanner.h
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__FileSystem.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__FileSystem.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__FileSystem.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/FileSystem.c++.orig 2003-04-15 06:21:30.000000000 +0200
++++ ./fam/FileSystem.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -22,7 +22,7 @@
+
+ #include "FileSystem.h"
+
+-#include <mntent.h>
++#include "mntent.h"
+ #include <string.h>
+
+ #include "Event.h"
Property changes on: trunk/devel/fam/files/patch-fam__FileSystem.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__FileSystemTable.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__FileSystemTable.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__FileSystemTable.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,10 @@
+--- ./fam/FileSystemTable.c++.orig 2003-04-15 06:21:31.000000000 +0200
++++ ./fam/FileSystemTable.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -255,7 +255,6 @@
+ // create_fs_by_name initializes our "root" member variable.
+ if (!fs_by_name)
+ { create_fs_by_name();
+- mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL);
+ }
+
+ cr.become_user();
Property changes on: trunk/devel/fam/files/patch-fam__FileSystemTable.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__IMon.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__IMon.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__IMon.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/IMon.c++.orig 2003-04-15 06:21:31.000000000 +0200
++++ ./fam/IMon.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++// #include "alloc.h"
+
+ int IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
Property changes on: trunk/devel/fam/files/patch-fam__IMon.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__Listener.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__Listener.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__Listener.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,22 @@
+--- ./fam/Listener.c++.orig 2003-04-15 06:52:40.000000000 +0200
++++ ./fam/Listener.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -36,6 +36,10 @@
+ #include <sys/stat.h>
+ #include <sys/un.h>
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <stdio.h>
++#include <stdlib.h>
++#endif // __FreeBSD__
+
+ #include <errno.h>
+
+@@ -203,7 +207,7 @@
+ // requested user and pass the name back to the client.
+
+ // Unset TMPDIR to ensure that tempnam() works as desired
+- putenv("TMPDIR=");
++ unsetenv("TMPDIR");
+
+ char *tmpfile = tempnam("/tmp", ".fam");
+ #if defined(__FreeBSD__)
Property changes on: trunk/devel/fam/files/patch-fam__Listener.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__Log.c++
===================================================================
--- trunk/devel/fam/files/patch-fam__Log.c++ (rev 0)
+++ trunk/devel/fam/files/patch-fam__Log.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,13 @@
+--- ./fam/Log.c++.orig 2003-04-15 06:21:36.000000000 +0200
++++ ./fam/Log.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -28,9 +28,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #ifdef HAVE_AUDIT
Property changes on: trunk/devel/fam/files/patch-fam__Log.c++
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__Makefile.am
===================================================================
--- trunk/devel/fam/files/patch-fam__Makefile.am (rev 0)
+++ trunk/devel/fam/files/patch-fam__Makefile.am 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,10 @@
+--- ./fam/Makefile.am.orig 2003-04-15 06:21:26.000000000 +0200
++++ ./fam/Makefile.am 2014-01-03 02:35:10.000000000 +0100
+@@ -72,6 +72,7 @@
+ main.c++ \
+ timeval.c++ \
+ timeval.h \
++ mntent_compat.c++ \
+ @IMON_FUNCS at .c++
+
+ EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
Property changes on: trunk/devel/fam/files/patch-fam__Makefile.am
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__SmallTable.h
===================================================================
--- trunk/devel/fam/files/patch-fam__SmallTable.h (rev 0)
+++ trunk/devel/fam/files/patch-fam__SmallTable.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,11 @@
+--- ./fam/SmallTable.h.orig 2003-04-15 06:21:43.000000000 +0200
++++ ./fam/SmallTable.h 2014-01-03 02:35:10.000000000 +0100
+@@ -98,7 +98,7 @@
+ }
+
+ template <class Tkey, class Tvalue>
+-SmallTable<Tkey, Tvalue>::Closure
++typename SmallTable<Tkey, Tvalue>::Closure
+ SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
+ {
+ unsigned l = 0, r = n;
Property changes on: trunk/devel/fam/files/patch-fam__SmallTable.h
___________________________________________________________________
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
Added: trunk/devel/fam/files/patch-fam__StringTable.h
===================================================================
--- trunk/devel/fam/files/patch-fam__StringTable.h (rev 0)
+++ trunk/devel/fam/files/patch-fam__StringTable.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,10 @@
+--- ./fam/StringTable.h.orig 2003-04-15 06:21:43.000000000 +0200
++++ ./fam/StringTable.h 2014-01-03 02:35:10.000000000 +0100
+@@ -25,6 +25,7 @@
+
+ #include <assert.h>
+ #include <string.h>
++#include "mntent.h"
+
+ // A StringTable maps C strings onto values. It is a cheap O(n)
+ // implementation, suitable only for small tables that are
Property changes on: trunk/devel/fam/files/patch-fam__StringTable.h
___________________________________________________________________
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
Modified: trunk/devel/fam/files/patch-include__BTree.h
===================================================================
--- trunk/devel/fam/files/patch-include__BTree.h 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/patch-include__BTree.h 2017-09-23 22:07:09 UTC (rev 22514)
@@ -1,5 +1,5 @@
---- include/BTree.h.orig Tue Jul 16 14:23:25 2002
-+++ include/BTree.h Sat Jul 31 13:13:24 2004
+--- ./include/BTree.h.orig 2003-04-15 06:21:19.000000000 +0200
++++ ./include/BTree.h 2014-01-03 02:35:37.000000000 +0100
@@ -236,7 +236,7 @@
// to the right and returns them.
@@ -9,6 +9,15 @@
BTree<Key, Value>::Node::remove(unsigned j)
{
Key k = key[j];
+@@ -318,7 +318,7 @@
+ assert(root->n);
+
+ Node *p, *q;
+- for (p = root; q = p->link[0]; p = q)
++ for (p = root; (q = p->link[0]); p = q)
+ continue;
+ return p->key[0];
+ }
@@ -348,7 +348,7 @@
}
Property changes on: trunk/devel/fam/files/patch-include__BTree.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/devel/fam/files/patch-libfam__Client.c++
===================================================================
--- trunk/devel/fam/files/patch-libfam__Client.c++ (rev 0)
+++ trunk/devel/fam/files/patch-libfam__Client.c++ 2017-09-23 22:07:09 UTC (rev 22514)
@@ -0,0 +1,19 @@
+--- ./libfam/Client.c++.orig 2003-04-15 06:21:25.000000000 +0200
++++ ./libfam/Client.c++ 2014-01-03 02:35:10.000000000 +0100
+@@ -34,7 +34,6 @@
+ #include <syslog.h>
+ #include <errno.h>
+
+-#include <iostream.h>
+
+ #include "fam.h"
+ #include "Client.h"
+@@ -264,7 +263,7 @@
+ {
+ char msg[100];
+ snprintf(msg, sizeof(msg),
+- "change info too long! (%d max)", sizeof(changeInfo));
++ "change info too long! (%lu max)", (unsigned long)sizeof(changeInfo));
+ croakConnection(msg);
+ return -1;
+ }
Property changes on: trunk/devel/fam/files/patch-libfam__Client.c++
___________________________________________________________________
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: trunk/devel/fam/files/pkg-message.in
===================================================================
--- trunk/devel/fam/files/pkg-message.in 2017-09-23 22:04:49 UTC (rev 22513)
+++ trunk/devel/fam/files/pkg-message.in 2017-09-23 22:07:09 UTC (rev 22514)
Property changes on: trunk/devel/fam/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list