[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.17, 1.18
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31286
Modified Files:
ldapserver.spec.tmpl
Log Message:
remove Requires for java - breaks non-RHEL platforms - we should either change the spec file to include the dependency only on RHEL, or just wait until gcj/classpath can run our stuff
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldapserver.spec.tmpl 16 Nov 2005 03:32:27 -0000 1.17
+++ ldapserver.spec.tmpl 16 Nov 2005 17:40:35 -0000 1.18
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,httpd,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
+Requires: perl,httpd,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
18 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.43,1.44
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3853
Modified Files:
Makefile
Log Message:
add jar files back to the main package - even though the gpl and apl are not generally compatible, they are compatible for this specific case
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile 11 Nov 2005 14:34:01 -0000 1.43
+++ Makefile 16 Nov 2005 03:53:06 -0000 1.44
@@ -238,7 +238,9 @@
# web services files that are Apache or Java licensed - we cannot put them
# in the same rpm/tarball as the directory server, so we create a separate
# package for them, using the below macro as the staging area
-EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
+#EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
+# actually, we can - GPL is compatible with APL in this situation
+EXT_JAVA_RELDIR = $(RELDIR)
DS_JAR_DEST_PATH = java/jars
XMLTOOLS_JAR_FILE = xmltools.jar
@@ -629,7 +631,7 @@
endif
ifeq ($(USE_DSMLGW), 1)
- cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
+# cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
endif
ifeq ($(USE_CONSOLE),1)
18 years, 5 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.16, 1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3774
Modified Files:
ldapserver.spec.tmpl
Log Message:
added a dependency on httpd
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldapserver.spec.tmpl 10 Nov 2005 01:35:45 -0000 1.16
+++ ldapserver.spec.tmpl 16 Nov 2005 03:32:27 -0000 1.17
@@ -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.15
+Requires: perl,httpd,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
18 years, 5 months
[Fedora-directory-commits] ldapserver nsconfig.mk,1.16,1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3745
Modified Files:
nsconfig.mk
Log Message:
set defaults to build java code, and use java, ant, and perl from PATH for external builds
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsconfig.mk 3 Oct 2005 19:53:40 -0000 1.16
+++ nsconfig.mk 16 Nov 2005 03:31:05 -0000 1.17
@@ -75,6 +75,10 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ GET_JAVA_FROM_PATH := 1
+ GET_ANT_FROM_PATH := 1
+ USE_PERL_FROM_PATH := 1
+ BUILD_JAVA_CODE := 1
endif
include $(BUILD_ROOT)/nsdefs.mk
18 years, 5 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.30, 1.31
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pkgadmin.mk 14 Nov 2005 03:57:32 -0000 1.30
+++ pkgadmin.mk 16 Nov 2005 03:18:29 -0000 1.31
@@ -121,6 +121,9 @@
IZIP = $(ZIP) -ry9uT -n .gif
endif
+# enable apache module packaging by default - apl is compatible with the gpl
+# in this specific instance
+PKG_APACHE_MODULES = 1
ifdef PKG_APACHE_MODULES
ifndef MOD_ADMSERV_LIB_DIR
MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
18 years, 5 months
[Fedora-directory-commits] adminserver nsconfig.mk,1.18,1.19
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/adminserver
Modified Files:
nsconfig.mk
Log Message:
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nsconfig.mk 3 Nov 2005 23:20:38 -0000 1.18
+++ nsconfig.mk 16 Nov 2005 03:18:24 -0000 1.19
@@ -30,12 +30,18 @@
ABS_ROOT := $(shell cd $(BUILD_ROOT)/..; pwd)
NSROOT = $(BUILD_ROOT)
+ifdef INTERNAL_BUILD
# the directory containing pre-built binary components for use during
# building and packaging, including Red Hat branded components
COMPONENTS_DIR = /share/builds/components
INT_DIR = /share/builds/sbsintegration
# these are Fedora branded components - only a few components are branded
FED_COMPONENTS_DIR = /fedora/components
+else
+# just set these by default
+GET_JAVA_FROM_PATH := 1
+GET_ANT_FROM_PATH := 1
+endif
include $(NSROOT)/nsdefs.mk
18 years, 5 months
[Fedora-directory-commits] directoryconsole build.xml,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10346
Modified Files:
build.xml
Log Message:
allow the definition of the console location on the command line with different directory layouts than the default
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 28 Oct 2005 18:01:11 -0000 1.2
+++ build.xml 14 Nov 2005 04:14:11 -0000 1.3
@@ -79,10 +79,10 @@
<!-- Construct classpath -->
<path id="ldapconsole.classpath">
<fileset dir="${console.location}">
- <include name="*/java/base.jar"/>
- <include name="*/java/mcc*.jar"/>
- <include name="*/java/nmclf*.jar"/>
- <include name="*/java/ldapjdk.jar"/>
+ <include name="**/java/base.jar"/>
+ <include name="**/java/mcc*.jar"/>
+ <include name="**/java/nmclf*.jar"/>
+ <include name="**/java/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
</path>
18 years, 5 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.29, 1.30
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8736/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
allow developers to build an adminserver with the 3 Apache modules included for convenience but not packaging
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pkgadmin.mk 3 Nov 2005 23:20:44 -0000 1.29
+++ pkgadmin.mk 14 Nov 2005 03:57:32 -0000 1.30
@@ -121,6 +121,21 @@
IZIP = $(ZIP) -ry9uT -n .gif
endif
+ifdef PKG_APACHE_MODULES
+ifndef MOD_ADMSERV_LIB_DIR
+ MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
+endif
+ifndef MOD_RESTARTD_LIB_DIR
+ MOD_RESTARTD_LIB_DIR=$(BUILD_ROOT)/../mod_restartd/.libs
+endif
+ifndef MOD_NSS_LIB_DIR
+ MOD_NSS_LIB_DIR=$(BUILD_ROOT)/../mod_nss/.libs
+endif
+ifndef MOD_NSS_BIN_DIR
+ MOD_NSS_BIN_DIR=$(BUILD_ROOT)/../mod_nss
+endif
+endif
+
ifneq ($(strip $(ADM_VERSION)),)
all:
-if [ ! -d $(PKGTOP) ]; then \
@@ -295,6 +310,14 @@
# Copy shared configuration
cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
+# The Apache modules, if present
+ifdef PKG_APACHE_MODULES
+ cp $(MOD_ADMSERV_LIB_DIR)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_RESTARTD_LIB_DIR)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_LIB_DIR)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_BIN_DIR)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
+endif
+
#
# Cleanup before making distributable tar
#
18 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.42,1.43
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Reviewed by Nathan (Thanks!)
Fix: Put the dsml gateway and command line jar files in a package called
extjava.tar.gz so that users can choose to deploy these separately if they
want dsml functionality.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile 10 Nov 2005 22:37:49 -0000 1.42
+++ Makefile 11 Nov 2005 14:34:01 -0000 1.43
@@ -234,6 +234,11 @@
NSDIST = $(BUILD_ROOT)/../dist
DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
+# this is the directory into which we place those java files and associated
+# web services files that are Apache or Java licensed - we cannot put them
+# in the same rpm/tarball as the directory server, so we create a separate
+# package for them, using the below macro as the staging area
+EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
DS_JAR_DEST_PATH = java/jars
XMLTOOLS_JAR_FILE = xmltools.jar
@@ -336,29 +341,33 @@
done
# install the DSMLGW into the client directory
+# the following DSML files must be packaged separately:
+# web-app_2_3.dtd, activation.jar, saaj.jar - due to Sun license
+# jaxrpc-api.jar, jaxrpc.jar, xercesImpl.jar, xml-apis.jar, crimson.jar - due to Apache license
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
+ $(MKDIR) $(EXT_JAVA_RELDIR)/clients/dsmlgw
if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
- $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(EXT_JAVA_RELDIR)/clients/dsmlgw/ ; \
fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
- $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
+ $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(EXT_JAVA_RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
$(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
# if so, I'm not sure where to get the implementation
if [ -f $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
fi
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
endif # USE_DSMLGW
# PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
@@ -479,9 +488,9 @@
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(EXT_JAVA_RELDIR)/$(DS_JAR_DEST_PATH)
if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
- $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(EXT_JAVA_RELDIR)/$(DS_JAR_DEST_PATH) ; \
fi
endif
@@ -619,6 +628,10 @@
endif
endif
+ifeq ($(USE_DSMLGW), 1)
+ cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
+endif
+
ifeq ($(USE_CONSOLE),1)
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
18 years, 5 months