[Fedora-directory-devel] Please review: Fedora Core 6 support + version change to 1.0.4

[Richard Megginson <rmeggins redhat com>]

FC 6 does not have /usr/include/linux/sys.h.  The two files in the diff 
below include it, but I'm not sure why.  If you look at the file on an 
earlier system, it appears that there is nothing in it.  All it seems to 
do is define NR_syscalls, which is not used anywhere in any include file 
that I can find, nor in any ds code.  So I propose changing the code not 
to include this file.
Also, the version has changed to 1.0.4, so I needed to update 
ldap/cm/Makefile.

Index: ldapserver/ldap/cm/Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.68
diff -u -8 -r1.68 Makefile
--- ldapserver/ldap/cm/Makefile	3 Nov 2006 19:49:52 -0000	1.68
+++ ldapserver/ldap/cm/Makefile	7 Nov 2006 01:54:39 -0000
@@ -105,19 +105,19 @@
 ifndef BuildDir
 HOST=$(shell hostname)
 BuildDir=$(shell cd $(RELTOOLSDIR);perl getdefaults -var BuildDir -if $(RELTOOLSDIR)/init/directory/directory5.init -machine $(HOST)) 
 endif
 endif
 endif
 
 ifdef USE_64
-VERSION=-ver 1.0.3-64bit
+VERSION=-ver 1.0.4-64bit
 else
-VERSION=-ver 1.0.3
+VERSION=-ver 1.0.4
 endif
 
 ifeq ($(ARCH), HPUX)
 RSH=remsh 
 REMSH=$(RSH) anuurn -l root
 else
 RSH=rsh 
 REMSH=$(RSH) anuurn -l root
@@ -271,17 +271,17 @@
 endif
 
 PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS))
 
 # set the values of the macros used by rpmbuild
 ifdef BUILD_RPM
 # name and version of RPM - must correspond to the spec file - these get branded
 	RPM_BASE_NAME=fedora
-	RPM_VERSION=1.0.3
+	RPM_VERSION=1.0.4
 	RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
 	RPM_ARCH = $(shell uname -i)
 # root dir for RPM built and temp files
 	ABS_TOPDIR = $(shell cd $(INSTDIR)/.. ; pwd)
 	RPM_TOPDIR = --define "_topdir $(ABS_TOPDIR)"
 # location of source tarball
 	RPM_SOURCEDIR = --define "_sourcedir $(ABS_TOPDIR)"
 # location of staging area built into RPM
Index: ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.11
diff -u -8 -r1.11 dblayer.c
--- ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c	18 Apr 2006 18:25:02 -0000	1.11
+++ ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c	7 Nov 2006 01:54:44 -0000
@@ -678,17 +678,16 @@
  * Solaris, Linux, Windows
  */
 #ifdef OS_solaris
 #include <sys/procfs.h>
 #include <sys/resource.h>
 #endif
 #ifdef LINUX
 #include <linux/kernel.h>
-#include <linux/sys.h>
 #include <sys/sysinfo.h>    /* undocumented (?) */
 #include <sys/resource.h>
 #endif
 #if defined ( hpux )
 #include <sys/pstat.h>
 #include <sys/resource.h>
 #endif
 
Index: ldapserver/ldap/systools/idsktune.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/systools/idsktune.c,v
retrieving revision 1.12
diff -u -8 -r1.12 idsktune.c
--- ldapserver/ldap/systools/idsktune.c	19 Apr 2005 22:07:44 -0000	1.12
+++ ldapserver/ldap/systools/idsktune.c	7 Nov 2006 01:54:46 -0000
@@ -103,17 +103,16 @@
 #define IDDS_MNTENT_OPTIONS mnt_mntopts
 #define IDDS_MNTENT_MNTTAB "/etc/mnttab"
 #endif
 
 #if defined(IDDS_LINUX_INCLUDE)
 #include <sys/vfs.h>
 #include <sys/utsname.h>
 #include <linux/kernel.h>
-#include <linux/sys.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <mntent.h>
 #include <sys/sysinfo.h>
 
 #define IDDS_MNTENT mntent
 #define IDDS_MNTENT_DIRNAME mnt_dir
 #define IDDS_MNTENT_OPTIONS mnt_opts

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature