rpms/ntfs-3g/F-11 ntfs-3g-2010.5.16-secaudit-usermap.patch, NONE, 1.1 ntfs-3g.spec, 1.52, 1.53 sources, 1.36, 1.37

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/ntfs-3g/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1745/F-11

Modified Files:
	ntfs-3g.spec sources 
Added Files:
	ntfs-3g-2010.5.16-secaudit-usermap.patch 
Log Message:
update to 2010.5.16

ntfs-3g-2010.5.16-secaudit-usermap.patch:
 Makefile.in |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 4 deletions(-)

--- NEW FILE ntfs-3g-2010.5.16-secaudit-usermap.patch ---
diff -up ntfs-3g-2010.5.16/src/Makefile.in.secaudit ntfs-3g-2010.5.16/src/Makefile.in
--- ntfs-3g-2010.5.16/src/Makefile.in.secaudit	2010-05-16 07:27:40.000000000 -0400
+++ ntfs-3g-2010.5.16/src/Makefile.in	2010-05-18 13:11:47.587952903 -0400
@@ -34,7 +34,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-bin_PROGRAMS = ntfs-3g.probe$(EXEEXT)
+bin_PROGRAMS = ntfs-3g.probe$(EXEEXT) ntfs-3g.usermap$(EXEEXT) \
+	ntfs-3g.secaudit$(EXEEXT)
 rootbin_PROGRAMS = ntfs-3g$(EXEEXT) lowntfs-3g$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -75,6 +76,20 @@ ntfs_3g_probe_DEPENDENCIES = $(top_build
 ntfs_3g_probe_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_probe_CFLAGS) \
 	$(CFLAGS) $(ntfs_3g_probe_LDFLAGS) $(LDFLAGS) -o $@
+am_ntfs_3g_secaudit_OBJECTS = ntfs_3g_secaudit-secaudit.$(OBJEXT)
+ntfs_3g_secaudit_OBJECTS = $(am_ntfs_3g_secaudit_OBJECTS)
+ntfs_3g_secaudit_DEPENDENCIES =  \
+        $(top_builddir)/libntfs-3g/libntfs-3g.la
+ntfs_3g_secaudit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_secaudit_CFLAGS) \
+        $(CFLAGS) $(ntfs_3g_secaudit_LDFLAGS) $(LDFLAGS) -o $@
+am_ntfs_3g_usermap_OBJECTS = ntfs_3g_usermap-usermap.$(OBJEXT)
+ntfs_3g_usermap_OBJECTS = $(am_ntfs_3g_usermap_OBJECTS)
+ntfs_3g_usermap_DEPENDENCIES =  \
+        $(top_builddir)/libntfs-3g/libntfs-3g.la
+ntfs_3g_usermap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_usermap_CFLAGS) \
+        $(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -88,9 +103,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(lowntfs_3g_SOURCES) $(ntfs_3g_SOURCES) \
-	$(ntfs_3g_probe_SOURCES)
+	$(ntfs_3g_probe_SOURCES) $(ntfs_3g_secaudit_SOURCES) \
+	$(ntfs_3g_usermap_SOURCES)
 DIST_SOURCES = $(lowntfs_3g_SOURCES) $(ntfs_3g_SOURCES) \
-	$(ntfs_3g_probe_SOURCES)
+	$(ntfs_3g_probe_SOURCES) $(ntfs_3g_secaudit_SOURCES) \
+	$(ntfs_3g_usermap_SOURCES)
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
@@ -232,13 +249,14 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+EXTRA_DIST = secaudit.h
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 @FUSE_INTERNAL_FALSE at FUSE_CFLAGS = $(FUSE_MODULE_CFLAGS)
 @FUSE_INTERNAL_TRUE at FUSE_CFLAGS = -I$(top_srcdir)/include/fuse-lite
 @FUSE_INTERNAL_FALSE at FUSE_LIBS = $(FUSE_MODULE_LIBS)
 @FUSE_INTERNAL_TRUE at FUSE_LIBS = 
 rootsbin_DATA = #Create directory
-man_MANS = ntfs-3g.8 ntfs-3g.probe.8
+man_MANS = ntfs-3g.8 ntfs-3g.probe.8 ntfs-3g.usermap.8 ntfs-3g.secaudit.8
 ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
 @REALLYSTATIC_TRUE at ntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
 ntfs_3g_CFLAGS = \
@@ -258,9 +276,17 @@ lowntfs_3g_CFLAGS = \
 
 lowntfs_3g_SOURCES = lowntfs-3g.c
 ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
 @REALLYSTATIC_TRUE at ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
+ at REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
+ at REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
 ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
+ntfs_3g_usermap_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
+ntfs_3g_secaudit_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
 ntfs_3g_probe_SOURCES = ntfs-3g.probe.c
+ntfs_3g_usermap_SOURCES = usermap.c
+ntfs_3g_secaudit_SOURCES = secaudit.c
 all: all-am
 
 .SUFFIXES:
@@ -367,6 +393,12 @@ ntfs-3g$(EXEEXT): $(ntfs_3g_OBJECTS) $(n
 ntfs-3g.probe$(EXEEXT): $(ntfs_3g_probe_OBJECTS) $(ntfs_3g_probe_DEPENDENCIES) 
 	@rm -f ntfs-3g.probe$(EXEEXT)
 	$(ntfs_3g_probe_LINK) $(ntfs_3g_probe_OBJECTS) $(ntfs_3g_probe_LDADD) $(LIBS)
+ntfs-3g.secaudit$(EXEEXT): $(ntfs_3g_secaudit_OBJECTS) $(ntfs_3g_secaudit_DEPENDENCIES)
+	@rm -f ntfs-3g.secaudit$(EXEEXT)
+	$(ntfs_3g_secaudit_LINK) $(ntfs_3g_secaudit_OBJECTS) $(ntfs_3g_secaudit_LDADD) $(LIBS)
+ntfs-3g.usermap$(EXEEXT): $(ntfs_3g_usermap_OBJECTS) $(ntfs_3g_usermap_DEPENDENCIES)
+	@rm -f ntfs-3g.usermap$(EXEEXT)
+	$(ntfs_3g_usermap_LINK) $(ntfs_3g_usermap_OBJECTS) $(ntfs_3g_usermap_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -377,6 +409,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lowntfs_3g-lowntfs-3g.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ntfs_3g-ntfs-3g.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ntfs_3g_probe-ntfs-3g.probe.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ntfs_3g_secaudit-secaudit.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ntfs_3g_usermap-usermap.Po at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -441,6 +475,34 @@ ntfs_3g_probe-ntfs-3g.probe.obj: ntfs-3g
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_probe_CFLAGS) $(CFLAGS) -c -o ntfs_3g_probe-ntfs-3g.probe.obj `if test -f 'ntfs-3g.probe.c'; then $(CYGPATH_W) 'ntfs-3g.probe.c'; else $(CYGPATH_W) '$(srcdir)/ntfs-3g.probe.c'; fi`
 
+ntfs_3g_secaudit-secaudit.o: secaudit.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) -MT ntfs_3g_secaudit-secaudit.o -MD -MP -MF $(DEPDIR)/ntfs_3g_secaudit-secaudit.Tpo -c -o ntfs_3g_secaudit-secaudit.o `test -f 'secaudit.c' || echo '$(srcdir)/'`secaudit.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ntfs_3g_secaudit-secaudit.Tpo $(DEPDIR)/ntfs_3g_secaudit-secaudit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secaudit.c' object='ntfs_3g_secaudit-secaudit.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) -c -o ntfs_3g_secaudit-secaudit.o `test -f 'secaudit.c' || echo '$(srcdir)/'`secaudit.c
+
+ntfs_3g_secaudit-secaudit.obj: secaudit.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) -MT ntfs_3g_secaudit-secaudit.obj -MD -MP -MF $(DEPDIR)/ntfs_3g_secaudit-secaudit.Tpo -c -o ntfs_3g_secaudit-secaudit.obj `if test -f 'secaudit.c'; then $(CYGPATH_W) 'secaudit.c'; else $(CYGPATH_W) '$(srcdir)/secaudit.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ntfs_3g_secaudit-secaudit.Tpo $(DEPDIR)/ntfs_3g_secaudit-secaudit.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='secaudit.c' object='ntfs_3g_secaudit-secaudit.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) -c -o ntfs_3g_secaudit-secaudit.obj `if test -f 'secaudit.c'; then $(CYGPATH_W) 'secaudit.c'; else $(CYGPATH_W) '$(srcdir)/secaudit.c'; fi`
+
+ntfs_3g_usermap-usermap.o: usermap.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_usermap_CFLAGS) $(CFLAGS) -MT ntfs_3g_usermap-usermap.o -MD -MP -MF $(DEPDIR)/ntfs_3g_usermap-usermap.Tpo -c -o ntfs_3g_usermap-usermap.o `test -f 'usermap.c' || echo '$(srcdir)/'`usermap.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ntfs_3g_usermap-usermap.Tpo $(DEPDIR)/ntfs_3g_usermap-usermap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usermap.c' object='ntfs_3g_usermap-usermap.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_usermap_CFLAGS) $(CFLAGS) -c -o ntfs_3g_usermap-usermap.o `test -f 'usermap.c' || echo '$(srcdir)/'`usermap.c
+
+ntfs_3g_usermap-usermap.obj: usermap.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_usermap_CFLAGS) $(CFLAGS) -MT ntfs_3g_usermap-usermap.obj -MD -MP -MF $(DEPDIR)/ntfs_3g_usermap-usermap.Tpo -c -o ntfs_3g_usermap-usermap.obj `if test -f 'usermap.c'; then $(CYGPATH_W) 'usermap.c'; else $(CYGPATH_W) '$(srcdir)/usermap.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ntfs_3g_usermap-usermap.Tpo $(DEPDIR)/ntfs_3g_usermap-usermap.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usermap.c' object='ntfs_3g_usermap-usermap.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfs_3g_usermap_CFLAGS) $(CFLAGS) -c -o ntfs_3g_usermap-usermap.obj `if test -f 'usermap.c'; then $(CYGPATH_W) 'usermap.c'; else $(CYGPATH_W) '$(srcdir)/usermap.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-3g/F-11/ntfs-3g.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ntfs-3g.spec	8 Mar 2010 20:35:00 -0000	1.52
+++ ntfs-3g.spec	18 May 2010 17:30:03 -0000	1.53
@@ -7,13 +7,14 @@
 
 Name:		ntfs-3g
 Summary:	Linux NTFS userspace driver
-Version:	2010.3.6
+Version:	2010.5.16
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://tuxera.com/opensource/ntfs-3g-%{version}%{?subver}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
+Patch1:		ntfs-3g-2010.5.16-secaudit-usermap.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -50,6 +51,7 @@ functionality.
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
 %patch0 -p1
+%patch1 -p1 -b .secaudit
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -114,11 +116,13 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/mount.ntfs
 %attr(754,root,root) /sbin/mount.ntfs-3g
 /sbin/mount.ntfs-fuse
+/sbin/mount.lowntfs-3g
 /bin/ntfs-3g
 /bin/ntfsmount
 /bin/ntfs-3g.probe
 /bin/ntfs-3g.secaudit
 /bin/ntfs-3g.usermap
+/bin/lowntfs-3g
 %{_bindir}/ntfs-3g
 %{_bindir}/ntfsmount
 /%{_lib}/libntfs-3g.so.*
@@ -132,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Tue May 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2010.5.16-1
+- update to 2010.5.16
+- fix makefile to build secaudit/usermap tools
+
 * Mon Mar  8 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2010.3.6-1
 - update to 2010.3.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-3g/F-11/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	8 Mar 2010 20:35:00 -0000	1.36
+++ sources	18 May 2010 17:30:03 -0000	1.37
@@ -1 +1 @@
-12ce21aa044c6068a4df6e8cbd3c5cfa  ntfs-3g-2010.3.6.tgz
+aeff7659a4943c9223d79116f051a863  ntfs-3g-2010.5.16.tgz