[Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037
Modified Files:
application.ini
Log Message:
Bump build ID.
Index: application.ini
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- application.ini 25 Oct 2006 04:00:14 -0000 1.3
+++ application.ini 25 Jan 2007 22:08:55 -0000 1.4
@@ -29,7 +29,7 @@
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=00000000018
+BuildID=00000000020
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
17 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.39, 1.40
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023/ldapserver/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: bug 224291
Bug Description: Move script-templates from sysconfdir to datadir
Reviewed by: nkinder, dennis (Thanks!)
Files: see diff
Branch: HEAD
Fix Description: Just change sysconfdir to datadir in both the Makefile.am (which controls where the files are put during installation) and in create_instance.c (which controls where instance creation looks for the templates to use them to create the real scripts).
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- create_instance.c 12 Dec 2006 06:39:17 -0000 1.39
+++ create_instance.c 25 Jan 2007 16:47:45 -0000 1.40
@@ -708,7 +708,7 @@
}
PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
+ cf->datadir, FILE_PATHSEP, cf->brand_ds,
FILE_PATHSEP, FILE_PATHSEP, name);
PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
create_instance_mkdir(cs_path, NEWDIR_MODE);
@@ -774,7 +774,7 @@
int fnlen = 0;
PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
- cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
+ cf->datadir, FILE_PATHSEP, cf->brand_ds,
FILE_PATHSEP, FILE_PATHSEP, name);
PR_snprintf(fn, sizeof(fn), "%s%c%s%cbin",
cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
17 years, 2 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.15, 1.16 Makefile.in, 1.16, 1.17 configure, 1.16, 1.17 configure.ac, 1.12, 1.13 aclocal.m4, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023/ldapserver
Modified Files:
Makefile.am Makefile.in configure configure.ac aclocal.m4
Log Message:
Resolves: bug 224291
Bug Description: Move script-templates from sysconfdir to datadir
Reviewed by: nkinder, dennis (Thanks!)
Files: see diff
Branch: HEAD
Fix Description: Just change sysconfdir to datadir in both the Makefile.am (which controls where the files are put during installation) and in create_instance.c (which controls where instance creation looks for the templates to use them to create the real scripts).
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am 12 Jan 2007 16:18:14 -0000 1.15
+++ Makefile.am 25 Jan 2007 16:47:45 -0000 1.16
@@ -60,7 +60,7 @@
schemadir = $(sysconfdir)@schemadir@
serverdir = $(libdir)@serverdir@
serverplugindir = $(libdir)@serverplugindir@
-taskdir = $(sysconfdir)@scripttemplatedir@
+taskdir = $(datadir)@scripttemplatedir@
#------------------------
# Build Products
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 12 Jan 2007 16:18:14 -0000 1.16
+++ Makefile.in 25 Jan 2007 16:47:45 -0000 1.17
@@ -951,7 +951,7 @@
#------------------------
BUILT_SOURCES = dirver.h dberrstrs.h
CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
-taskdir = $(sysconfdir)@scripttemplatedir@
+taskdir = $(datadir)@scripttemplatedir@
server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la
serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure 12 Jan 2007 16:18:15 -0000 1.16
+++ configure 25 Jan 2007 16:47:45 -0000 1.17
@@ -24602,7 +24602,7 @@
serverdir=/fedora-ds
# relative to libdir
serverplugindir=/fedora-ds/plugins
-# relative to sysconfdir
+# relative to datadir
scripttemplatedir=/fedora-ds/script-templates
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.ac 12 Jan 2007 16:18:15 -0000 1.12
+++ configure.ac 25 Jan 2007 16:47:45 -0000 1.13
@@ -130,7 +130,7 @@
serverdir=/fedora-ds
# relative to libdir
serverplugindir=/fedora-ds/plugins
-# relative to sysconfdir
+# relative to datadir
scripttemplatedir=/fedora-ds/script-templates
AC_SUBST(configdir)
AC_SUBST(sampledatadir)
17 years, 2 months
[Fedora-directory-commits] esc/src/lib/coolkey Mac-universal.mk, 1.1, 1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21775
Modified Files:
Mac-universal.mk
Log Message:
Don't hard code path to CoolKey include directory.
Index: Mac-universal.mk
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/Mac-universal.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mac-universal.mk 10 Jan 2007 02:22:26 -0000 1.1
+++ Mac-universal.mk 19 Jan 2007 22:29:24 -0000 1.2
@@ -40,7 +40,7 @@
make -f common.mk clean
sudo gcc_select 3.3
echo "Build ppc."
- make -f common.mk OSX_ARCH_FLAGS="-arch ppc" CKY_INCLUDE=/usr/local/CoolKey/include
+ make -f common.mk OSX_ARCH_FLAGS="-arch ppc"
cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC)
lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(OBJDIR)/$(DARWIN_LIB_NAME)
17 years, 2 months
[Fedora-directory-commits] coolkey/src/install pk11install.c, 1.1, 1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3194
Modified Files:
pk11install.c
Log Message:
Use define MAC instead of DARWIN for Mac ifdefs. Allows program to compile on the Mac.
Index: pk11install.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/pk11install.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pk11install.c 13 Oct 2006 01:16:26 -0000 1.1
+++ pk11install.c 18 Jan 2007 01:05:07 -0000 1.2
@@ -144,7 +144,7 @@
{ AppDataDir, "Thunderbird\\Profiles\\*", NULL },
{ NetscapeInstallDir, "..\\Users\\*", NULL },
#endif
-#ifndef DARWIN
+#ifndef MAC
#ifdef UNIX
{ HomeDir, ".mozilla/firefox/*", NULL },
{ HomeDir, ".mozilla/*", NULL },
@@ -152,7 +152,7 @@
{ HomeDir, ".netscape", NULL },
#endif
#endif
-#ifdef DARWIN
+#ifdef MAC
{ HomeDir, "Library/Mozilla/Profiles/*", "*.slt"},
{ HomeDir, "Library/Application Support/Firefox/Profiles/*", NULL },
17 years, 2 months
[Fedora-directory-commits] coolkey/src/install Makefile.in,1.2,1.3
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3099
Modified Files:
Makefile.in
Log Message:
Utilize the contents of NSS_LIBS when linking executable, used when building Mac version.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 30 Nov 2006 22:35:28 -0000 1.2
+++ Makefile.in 18 Jan 2007 01:03:54 -0000 1.3
@@ -74,7 +74,8 @@
PROGRAMS = $(bin_PROGRAMS)
am_pk11install_OBJECTS = pk11install.$(OBJEXT)
pk11install_OBJECTS = $(am_pk11install_OBJECTS)
-pk11install_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+pk11install_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -210,7 +211,7 @@
target_vendor = @target_vendor@
INCLUDES = $(NSS_CFLAGS)
pk11install_SOURCES = pk11install.c
-pk11install_LDADD = -lsoftokn3
+pk11install_LDADD = $(NSS_LIBS) -lsoftokn3
all: all-am
.SUFFIXES:
17 years, 2 months
[Fedora-directory-commits] coolkey/src/install Makefile.am,1.1,1.2
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2900
Modified Files:
Makefile.am
Log Message:
Utilize the contents of NSS_LIBS when linking executable, used when building Mac version.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 13 Oct 2006 01:16:26 -0000 1.1
+++ Makefile.am 18 Jan 2007 01:02:35 -0000 1.2
@@ -24,4 +24,4 @@
bin_PROGRAMS=pk11install
pk11install_SOURCES = pk11install.c
-pk11install_LDADD = -lsoftokn3
+pk11install_LDADD = $(NSS_LIBS) -lsoftokn3
17 years, 2 months
[Fedora-directory-commits] coolkey/src/coolkey Makefile.in,1.7,1.8
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31964
Modified Files:
Makefile.in
Log Message:
Alter LDFLAGS to allow darwin build to produce a dylib.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 30 Nov 2006 22:35:22 -0000 1.7
+++ Makefile.in 18 Jan 2007 01:00:55 -0000 1.8
@@ -260,7 +260,7 @@
slot.h \
$(NULL)
-libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym -no-undefined
+libcoolkeypk11_la_LDFLAGS = -avoid-version -export-symbols coolkeypk11.sym -no-undefined
libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS) $(ZLIB_CFLAGS)
libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@ $(ZLIB_LIBS)
17 years, 2 months
[Fedora-directory-commits] coolkey/src/coolkey Makefile.am,1.4,1.5
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31893
Modified Files:
Makefile.am
Log Message:
Alter LDFLAGS to allow darwin build to produce a dylib.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am 25 Aug 2006 00:31:40 -0000 1.4
+++ Makefile.am 18 Jan 2007 01:00:25 -0000 1.5
@@ -48,7 +48,7 @@
slot.h \
$(NULL)
-libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym -no-undefined
+libcoolkeypk11_la_LDFLAGS = -avoid-version -export-symbols coolkeypk11.sym -no-undefined
libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS) $(ZLIB_CFLAGS)
libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@ $(ZLIB_LIBS)
17 years, 2 months
[Fedora-directory-commits] coolkey configure.in,1.7,1.8
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31835
Modified Files:
configure.in
Log Message:
Add compile and link flags to compile on darwin.
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in 30 Nov 2006 22:35:22 -0000 1.7
+++ configure.in 18 Jan 2007 00:59:11 -0000 1.8
@@ -71,8 +71,11 @@
MAC=1
SCARD_LIB_NAME="PCSC.Framework/PCSC"
PCSC_MSG=yes
- PCSC_CFLAGS=""
+ PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
PCSC_LIBS="-Wl,-framework,PCSC"
+ CFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ LDFLAGS="-L/System/Library/Frameworks/Security.framework/Versions/Current/Security -arch ppc -arch i386"
+ CXXFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
;;
*)
AC_MSG_RESULT([UNIX/LINUX])
17 years, 2 months