[Fedora-directory-commits] winsync/passwordsync package.mak, NONE, 1.1 build.bat, 1.9, 1.10
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/passwordsync
Modified Files:
build.bat
Added Files:
package.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for PassSync.msi
ALL : PassSync.msi
LAYOUT :
copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
PassSync.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\PassSync.wxs"
light PassSync.wixobj
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/build.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.bat 12 Oct 2005 23:26:52 -0000 1.9
+++ build.bat 10 Nov 2005 00:04:05 -0000 1.10
@@ -39,101 +39,149 @@
@echo off
-pushd
-
-rem Convert %OBJEST% to absolute.
-call :relative %OBJDEST%
-
if [%BUILD_DEBUG%] == [optimize] (
- set LIBROOT=..\..\..\..\dist\WINNT5.0_OPT.OBJ
+ set FLAVOR=WINNT5.0_OPT.OBJ
) else (
- set LIBROOT=..\..\..\..\dist\WINNT5.0_DBG.OBJ
+ set FLAVOR=WINNT5.0_DBG.OBJ
)
-echo %LIBROOT%
+rem ======== Set Various Build Directories ========
+set OBJDEST=..\built\%FLAVOR%
+rem ------ Convert OBJEST to absolute ------
+call :relative %OBJDEST% OBJDEST
+
+set LIBROOT=..\components\%FLAVOR%
+rem ------ Convert LIBROOT to absolute ------
+call :relative %LIBROOT% LIBROOT
+mkdir %LIBROOT%
+
+set PKGDIR=%OBJDEST%\package\passsync
+mkdir %PKGDIR%
+
+set DISTDIR=..\dist\%FLAVOR%
+rem ------ Convert DISTDIR to absolute ------
+call :relative %DISTDIR% DISTDIR
+mkdir %DISTDIR%
set WXSDIR=%CD%\wix
-set INCLUDE=%INCLUDE%;%CD%\%LIBROOT%\ldapsdk\include;%CD%\%LIBROOT%\nspr\include;%CD%\%LIBROOT%\nss\include
-set LIB=%LIB%;%CD%\%LIBROOT%\ldapsdk\lib;%CD%\%LIBROOT%\nspr\lib;%CD%\%LIBROOT%\nss\lib
-set PATH=%PATH%;%CD%\%LIBROOT%\wix
+rem ======== Fetch Components ========
+if [%INTERNAL_BUILD%] == [1] (
+ set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
+) else (
+ set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
+)
+
+rem ------ NSPR ------
+set NSPR_LOCATION=%COMPONENT_URL%/nspr/v4.6
+if NOT EXIST %LIBROOT%\nspr (
+ pushd %CD%
+ mkdir %LIBROOT%\nspr
+ cd %LIBROOT%\nspr
+ echo %NSPR_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %NSPR_LOCATION%/%FLAVOR%/mdbinary.jar
+ wget --no-directories -Pinclude %NSPR_LOCATION%/%FLAVOR%/mdheader.jar
+ unzip -q mdbinary.jar
+ cd include
+ unzip -q mdheader.jar
+ popd
+)
+
+rem ------ NSS ------
+set NSS_LOCATION=%COMPONENT_URL%/nss/NSS_3_10_2_RTM
+if NOT EXIST %LIBROOT%\nss (
+ pushd %CD%
+ mkdir %LIBROOT%\nss
+ cd %LIBROOT%\nss
+ echo %NSS_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %NSS_LOCATION%/%FLAVOR%/mdbinary.jar
+ wget --no-directories -Pinclude %NSS_LOCATION%/xpheader.jar
+ unzip -q mdbinary.jar
+ cd include
+ unzip -q xpheader.jar
+ popd
+)
+
+rem ------ LDAPSDK ------
+set LDAPSDK_LOCATION=%COMPONENT_URL%/ldapsdk50/v5.16
+if NOT EXIST %LIBROOT%\ldapsdk (
+ pushd %CD%
+ mkdir %LIBROOT%\ldapsdk
+ cd %LIBROOT%\ldapsdk
+ echo %LDAPSDK_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %LDAPSDK_LOCATION%/%FLAVOR%/ldapcsdk516.zip
+ unzip -q ldapcsdk516.zip
+ popd
+)
set OK=0
+pushd %CD%
+
+rem ======== Build ========
+rem ------ Set Build Paths ------
+set INCLUDE=%INCLUDE%;%LIBROOT%\ldapsdk\include;%LIBROOT%\nspr\include;%LIBROOT%\nss\include
+set LIB=%LIB%;%LIBROOT%\ldapsdk\lib;%LIBROOT%\nspr\lib;%LIBROOT%\nss\lib
+
+rem ------ PassSync ------
cd passsync
-echo Entering %CD%
+echo -------- Beginning PassSync Build --------
-:BUILD
-nmake passsync.mak
+nmake /f passsync.mak
set /a OK=%OK% + %ERRORLEVEL%
-copy /Y %OBJDEST%\passsync\passsync.exe %OBJDEST%\
-set /a OK=%OK% + %ERRORLEVEL%
+if [%OK%] GTR [1] (
+ echo -------- PassSync Build Failed! --------
+ goto :END
+) else (
+ echo -------- PassSync Build Successful! --------
+)
+rem ------ Passhook ------
cd ..\passhook
-echo Entering %CD%
-
-nmake passhook.mak
-set /a OK=%OK% + %ERRORLEVEL%
+echo -------- Beginning Passhook Build --------
-copy /Y %OBJDEST%\passhook\passhook.dll %OBJDEST%\
+nmake /f passhook.mak
set /a OK=%OK% + %ERRORLEVEL%
-:PKG
-
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldap32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldap32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldapssl32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldapssl32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldappr32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldappr32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libnspr4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libnspr4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libplds4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libplds4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libplc4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libplc4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\nss3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\nss3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\ssl3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\ssl3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
- copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
- copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+if [%OK%] GTR [1] (
+ echo -------- Passhook Build Failed! --------
+ goto :END
+) else (
+ echo -------- Passhook Build Successful! --------
)
-xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
-
-cd %OBJDEST%
-echo Entering %CD%
+rem ======== Package ========
+cd ..
+echo -------- Beginning Packaging --------
-candle %WXSDIR%\PassSync.wxs
+nmake /f package.mak
set /a OK=%OK% + %ERRORLEVEL%
-light PassSync.wixobj
-set /a OK=%OK% + %ERRORLEVEL%
+if EXIST %PKGDIR%\PassSync.msi (
+ copy /Y %PKGDIR%\PassSync.msi %DISTDIR%
+ set /a OK=%OK% + %ERRORLEVEL%
+)
-:relative
-set OBJDEST=%~f1
-goto :EOF
+if [%OK%] GTR [1] (
+ echo -------- Packaging Failed! --------
+ goto :END
+) else (
+ echo -------- Packaging Successful! --------
+)
:END
popd
-if %OK% GTR 1 (set OK=1)
+if [%OK%] GTR [1] (
+ echo -------- Build Failed! --------
+ set OK=1
+) else (
+ echo -------- Build Successful! --------
+)
exit %OK%
+
+:relative
+rem ======== Converts relative path to absolute path ========
+rem ------ %1 is the path, %2 is the variable to be set ------
+set %2=%~f1
+goto :EOF
18 years, 5 months
[Fedora-directory-commits] winsync winsync.mak,NONE,1.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005
Added Files:
winsync.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE winsync.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for Windows Sync components
#
ALL : PASSSYNC NTDS
CLEAN_ALL : CLEAN
if exist components rmdir /S/Q components
CLEAN :
if exist built rmdir /S/Q built
if exist dist rmdir /S/Q dist
PASSSYNC :
cd passwordsync
build.bat
cd ..
NTDS :
cd usersync
build.bat
cd ..
18 years, 5 months
[Fedora-directory-commits] adminserver/base Makefile,1.14,1.15
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918/base
Modified Files:
Makefile
Log Message:
172812 - Don't overwrite ANT_HOME on on external builds. Also don't package ant jarfiles in the console java directory.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 6 Oct 2005 03:13:42 -0000 1.14
+++ Makefile 9 Nov 2005 23:22:55 -0000 1.15
@@ -185,6 +185,8 @@
(cd $(CONSOLE_JAR_DIR); \
cp -p -R * $(CLIENT_DIR)/$(JAVA_DIR))
rm -f $(CLIENT_DIR)/$(JAVA_DIR)/startconsole
+ rm -f $(CLIENT_DIR)/$(JAVA_DIR)/ant*
+ rm -f $(CLIENT_DIR)/$(JAVA_DIR)/xpclass.jar
# Copy startconsole
(cd $(CONSOLE_BASE_DIR); cp -p startconsole $(CLIENT_DIR)/)
18 years, 5 months
[Fedora-directory-commits] adminserver components.mk,1.39,1.40
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918
Modified Files:
components.mk
Log Message:
172812 - Don't overwrite ANT_HOME on on external builds. Also don't package ant jarfiles in the console java directory.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- components.mk 3 Nov 2005 23:20:38 -0000 1.39
+++ components.mk 9 Nov 2005 23:22:50 -0000 1.40
@@ -396,7 +396,11 @@
ANTLAUNCHERJAR = ant-launcher.jar
ANT_FILES = $(ANTJAR) $(ANTLAUNCHERJAR)
ANT_RELEASE = $(COMPONENTS_DIR)
-ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+ifdef INTERNAL_BUILD
+ ifndef GET_ANT_FROM_PATH
+ ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+ endif
+endif
ANT_DIR = $(ANT_HOME)/lib
ANT_DEP = $(addprefix $(CLASS_DEST)/, $(ANT_FILES))
ANT_CP = $(subst $(SPACE),$(PATH_SEP),$(ANT_DEP))
18 years, 5 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.14, 1.15
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4933
Modified Files:
ldapserver.spec.tmpl
Log Message:
Changed cyrus-sasl rpm dependency to >=2.1.15 for RHEL3 compatibility
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ldapserver.spec.tmpl 4 Nov 2005 22:43:31 -0000 1.14
+++ ldapserver.spec.tmpl 9 Nov 2005 21:10:44 -0000 1.15
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
+Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
@@ -132,6 +132,9 @@
fi
%changelog
+* Wed Nov 09 2005 Nathan Kinder <nkinder(a)redhat.com> 7.1-2
+- Changed cyrus-sasl dependency to >= 2.1.15 for RHEL3 compatibility
+
* Fri Nov 04 2005 Noriko Hosoi <nhosoi(a)redhat.com> 7.1-2
- Added a dependency: cyrus-sasl >= 2.1.19
18 years, 5 months
[Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12673
Modified Files:
Makefile
Log Message:
libadminutil##.<ext> should not link SSL related ldapsdk libraries.
(libssldap50.so and libprldap50.so)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 21 Jul 2005 21:57:26 -0000 1.2
+++ Makefile 9 Nov 2005 07:16:40 -0000 1.3
@@ -60,7 +60,7 @@
LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES))
endif
-DEPLIBS += $(NSPRLINK) $(LDAPLINK) $(ICULINK)
+DEPLIBS += $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK)
ifeq ($(ARCH), SOLARIS)
ifeq ($(NS_USE_NATIVE), 1)
18 years, 5 months
[Fedora-directory-commits] setuputil nsconfig.mk, 1.1.1.1, 1.2 nsdefs.mk, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/setuputil
Modified Files:
nsconfig.mk nsdefs.mk
Log Message:
setuputil was using something wacky (we really ought to have standardized make/shell code that generates the same objdir name across all components/platforms, but I suppose this won't be a problem after we convert to automake for everything).
Before: Linux2.6.13_i686_glibc_PTH_OPT.OBJ
After: Linux2.6_x86_glibc_PTH_OPT.OBJ
Same as the other components.
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsconfig.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ nsconfig.mk 9 Nov 2005 01:56:12 -0000 1.2
@@ -44,7 +44,9 @@
ifeq ($(NSOS_ARCH),Linux)
ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ NSOS_TMP := x86
+ else
+ NSOS_TMP := $(NSOS_TEST1)
endif
ifeq ($(USE_LIBC),1)
LIBC_VERSION = _libc
@@ -52,7 +54,7 @@
LIBC_VERSION = _glibc
endif
PTHREAD_TAG = _PTH
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(LIBC_VERSION)$(PTHREAD_TAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
NSCONFIG_NOTAG = $(NSCONFIG)
NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
else
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsdefs.mk 26 Oct 2005 16:38:09 -0000 1.3
+++ nsdefs.mk 9 Nov 2005 01:56:12 -0000 1.4
@@ -170,6 +170,13 @@
NSOS_RELEASE = 4
# Always use gcc on RHEL
GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
+ else
+# generic Linux
+ NSOS_ARCH := Linux
+# just keep major.minor release version e.g.
+# 2.6.13-1.1532_FC4 -> 2.6
+# also 10.11.4444 -> 10.11
+ NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
endif
endif
endif
18 years, 5 months
[Fedora-directory-commits] adminutil nsperl.mk,1.1.1.1,1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23677
Modified Files:
nsperl.mk
Log Message:
make PERL5 use perl from PATH on Linux
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsperl.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsperl.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ nsperl.mk 8 Nov 2005 18:21:47 -0000 1.2
@@ -76,18 +76,6 @@
ifeq ($(OSVER), HP-UXB.11.11)
PERL5=/u/robobld/nsperl/hpux/nsperl
endif
-ifeq ($(OSVER), Linux2.1)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.2)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.4)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL3)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL4)
-PERL5=/usr/bin/perl
+ifeq ($(BUILD_ARCH), Linux)
+PERL5=perl
endif
18 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/ldapserver/ldap/servers/slapd
Modified Files:
saslbind.c
Log Message:
Bug(s) fixed: 172672
Bug Description: sasl code needs to accomodate older versions of sasl
Reviewed by: Noriko (Thanks!)
Fix Description: 1) Change build to use -L/usr/kerberos/lib on RHEL3
since that's where gssapi_krb5 is on that platform 2) ifdef out the use
of SASL_AUX_PASSWORD_PROP - if it's not defined, we don't need to use it.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- saslbind.c 4 Nov 2005 19:02:57 -0000 1.12
+++ saslbind.c 8 Nov 2005 15:58:22 -0000 1.13
@@ -498,11 +498,14 @@
clear = pw;
if (clear) {
+/* older versions of sasl do not have SASL_AUX_PASSWORD_PROP, so omit it */
+#ifdef SASL_AUX_PASSWORD_PROP
if (prop_set(propctx, SASL_AUX_PASSWORD_PROP, clear, -1) != 0) {
/* Failure is benign here because some mechanisms don't support this property */
/*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);
goto fail */ ;
}
+#endif /* SASL_AUX_PASSWORD_PROP */
if (prop_set(propctx, SASL_AUX_PASSWORD, clear, -1) != 0) {
/* Failure is benign here because some mechanisms don't support this property */
/*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);
18 years, 5 months
[Fedora-directory-commits] ldapserver components.mk,1.36,1.37
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/ldapserver
Modified Files:
components.mk
Log Message:
Bug(s) fixed: 172672
Bug Description: sasl code needs to accomodate older versions of sasl
Reviewed by: Noriko (Thanks!)
Fix Description: 1) Change build to use -L/usr/kerberos/lib on RHEL3
since that's where gssapi_krb5 is on that platform 2) ifdef out the use
of SASL_AUX_PASSWORD_PROP - if it's not defined, we don't need to use it.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- components.mk 4 Nov 2005 02:45:20 -0000 1.36
+++ components.mk 8 Nov 2005 15:58:16 -0000 1.37
@@ -355,7 +355,11 @@
### SASL package ##########################################
ifeq ($(ARCH), Linux)
- SASL_LIBPATH = /usr/lib
+ ifeq ($(BUILD_ARCH), RHEL3)
+ SASL_LIBPATH = /usr/kerberos/lib
+ else
+ SASL_LIBPATH = /usr/lib
+ endif
SASL_INCDIR = /usr/include/sasl
else
ifdef SASL_SOURCE_ROOT
18 years, 5 months