[Fedora-directory-commits] adminutil component_versions.mk,1.4,1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15538
Modified Files:
component_versions.mk
Log Message:
[195258] Changes for the internal build
NSPR version: v4.6 -> v4.6.2
NSS version: NSS_3_11_RTM -> NSS_3_11_1_RTM
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/component_versions.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- component_versions.mk 1 Mar 2006 23:44:01 -0000 1.4
+++ component_versions.mk 15 Jun 2006 01:26:02 -0000 1.5
@@ -34,12 +34,12 @@
# naming scheme.
# NSPR
ifndef NSPR_RELDATE
- NSPR_RELDATE = v4.6
+ NSPR_RELDATE = v4.6.2
endif
# SECURITY (NSS) LIBRARY
ifndef SECURITY_RELDATE
- SECURITY_RELDATE = NSS_3_11_RTM
+ SECURITY_RELDATE = NSS_3_11_1_RTM
endif
# LDAP SDK
17 years, 9 months
[Fedora-directory-commits] esc - Imported sources
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5254
Log Message:
Initial drop of ESC code.
Status:
Vendor Tag: redhat
Release Tags: start
N esc/Makefile
N esc/LICENSE
N esc/manifest.mn
N esc/coreconf/Linux2.1.mk
N esc/coreconf/config.mk
N esc/coreconf/import.pl
N esc/coreconf/cpdist.pl
N esc/coreconf/module.mk
N esc/coreconf/version.mk
N esc/coreconf/LinuxELF2.0.mk
N esc/coreconf/Linux2.5.mk
N esc/coreconf/version.pl
N esc/coreconf/UNIX.mk
N esc/coreconf/Linux2.4.mk
N esc/coreconf/headers.mk
N esc/coreconf/tree.mk
N esc/coreconf/LinuxELF1.2.mk
N esc/coreconf/outofdate.pl
N esc/coreconf/Makefile
N esc/coreconf/suffix.mk
N esc/coreconf/location.mk
N esc/coreconf/Linux2.6.mk
N esc/coreconf/release.pl
N esc/coreconf/source.mk
N esc/coreconf/coreconf.pl
N esc/coreconf/Linux2.2.mk
N esc/coreconf/arch.mk
N esc/coreconf/jniregen.pl
N esc/coreconf/ruleset.mk
N esc/coreconf/jdk.mk
N esc/coreconf/rules.mk
N esc/coreconf/prefix.mk
N esc/coreconf/Linux.mk
N esc/coreconf/Darwin.mk
N esc/coreconf/command.mk
N esc/coreconf/makefile.win
N esc/coreconf/nsinstall/nfspwd.pl
N esc/coreconf/nsinstall/Makefile
N esc/coreconf/nsinstall/pathsub.h
N esc/coreconf/nsinstall/pathsub.c
N esc/coreconf/nsinstall/sunos4.h
N esc/coreconf/nsinstall/nsinstall.c
N esc/coreconf/nsinstall/nfspwd
N esc/src/Makefile
N esc/src/manifest.mn
N esc/src/lib/NssHttpClient/stdafx.h
N esc/src/lib/NssHttpClient/PSCommonLib.h
N esc/src/lib/NssHttpClient/config.mk
N esc/src/lib/NssHttpClient/NssHttpClient.h
N esc/src/lib/NssHttpClient/nscperror.cpp
N esc/src/lib/NssHttpClient/response.cpp
N esc/src/lib/NssHttpClient/response.h
N esc/src/lib/NssHttpClient/NssHttpClient.sln
N esc/src/lib/NssHttpClient/NssHttpClient.vcproj
N esc/src/lib/NssHttpClient/HttpClientNss.h
N esc/src/lib/NssHttpClient/Makefile
N esc/src/lib/NssHttpClient/Util.cpp
N esc/src/lib/NssHttpClient/http.h
N esc/src/lib/NssHttpClient/httpClientNss.cpp
N esc/src/lib/NssHttpClient/request.cpp
N esc/src/lib/NssHttpClient/http.cpp
N esc/src/lib/NssHttpClient/engine.cpp
N esc/src/lib/NssHttpClient/stdafx.cpp
N esc/src/lib/NssHttpClient/Util.h
N esc/src/lib/NssHttpClient/Cache.cpp
N esc/src/lib/NssHttpClient/engine.h
N esc/src/lib/NssHttpClient/Cache.h
N esc/src/lib/NssHttpClient/NssHttpClient.cpp
N esc/src/lib/NssHttpClient/manifest.mn
N esc/src/lib/NssHttpClient/httpchunked.def
N esc/src/lib/NssHttpClient/Defines.h
N esc/src/lib/NssHttpClient/request.h
N esc/src/lib/NssHttpClient/Iterator.h
N esc/src/lib/coolkey/config.mk
N esc/src/lib/coolkey/SmartCardMonitoringThread.h
N esc/src/lib/coolkey/CoolKey.h
N esc/src/lib/coolkey/SAOL_OIDS.h
N esc/src/lib/coolkey/Makefile
N esc/src/lib/coolkey/CoolKeyID.h
N esc/src/lib/coolkey/NSSManager.h
N esc/src/lib/coolkey/ckymanager.def
N esc/src/lib/coolkey/CoolKeyPref.cpp
N esc/src/lib/coolkey/CoolKey.cpp
N esc/src/lib/coolkey/CoolKey_Message.cpp
N esc/src/lib/coolkey/CoolKey_Message.h
N esc/src/lib/coolkey/SlotUtils.h
N esc/src/lib/coolkey/NSSManager.cpp
N esc/src/lib/coolkey/SmartCardMonitoringThread.cpp
N esc/src/lib/coolkey/CoolKeyPref.h
N esc/src/lib/coolkey/manifest.mn
N esc/src/lib/coolkey/CoolKeyHandler.cpp
N esc/src/lib/coolkey/CoolKeyHandler.h
N esc/src/lib/coolkey/SlotUtils.cpp
N esc/src/app/xpcom/rhICoolKey.idl
N esc/src/app/xpcom/rhIKeyNotify.idl
N esc/src/app/xpcom/CoolKeyCSP.cpp
N esc/src/app/xpcom/Makefile
N esc/src/app/xpcom/openkey.h
N esc/src/app/xpcom/CoolKeyCSP.h
N esc/src/app/xpcom/Makefile.moz
N esc/src/app/xpcom/rhCoolKey.h
N esc/src/app/xpcom/rhCoolKey.cpp
N esc/src/app/xpcom/tray/Makefile.in
N esc/src/app/xpcom/tray/rhMacTray.cpp
N esc/src/app/xpcom/tray/Makefile
N esc/src/app/xpcom/tray/resource.h
N esc/src/app/xpcom/tray/Makefile.moz
N esc/src/app/xpcom/tray/CoolKeyLogo.gif
N esc/src/app/xpcom/tray/rhLinuxTray.cpp
N esc/src/app/xpcom/tray/rhITrayWindNotify.idl
N esc/src/app/xpcom/tray/cool.rc
N esc/src/app/xpcom/tray/esc.bmp
N esc/src/app/xpcom/tray/rhTray.cpp
N esc/src/app/xpcom/tray/esc.ico
N esc/src/app/xpcom/tray/rhTray.h
N esc/src/app/xpcom/tray/cool.ico
N esc/src/app/xpcom/tray/rhITray.idl
N esc/src/app/xul/esc/application.ini
N esc/src/app/xul/esc/chrome/chrome.manifest
N esc/src/app/xul/esc/chrome/content/esc/TRAY.js
N esc/src/app/xul/esc/chrome/content/esc/ESC.js
N esc/src/app/xul/esc/chrome/content/esc/esc-image-large.bmp
N esc/src/app/xul/esc/chrome/content/esc/esc.css
N esc/src/app/xul/esc/chrome/content/esc/esc.xul
N esc/src/app/xul/esc/chrome/content/esc/CertInfo.js
N esc/src/app/xul/esc/chrome/content/esc/bg.jpg
N esc/src/app/xul/esc/chrome/content/esc/logo.gif
N esc/src/app/xul/esc/chrome/content/esc/esc_browser.xul
N esc/src/app/xul/esc/chrome/content/esc/GenericAuth.js
N esc/src/app/xul/esc/chrome/content/esc/settings.xul
N esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul
N esc/src/app/xul/esc/chrome/content/esc/config.xul
N esc/src/app/xul/esc/chrome/content/esc/certinfo.xul
N esc/src/app/xul/esc/chrome/content/esc/contents.rdf
N esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd
N esc/src/app/xul/esc/chrome/locale/en-US/esc.properties
N esc/src/app/xul/esc/defaults/preferences/esc-prefs.js
No conflicts created by this import
17 years, 9 months
[Fedora-directory-commits] coolkey coolkey.spec,1.3,1.4
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722
Modified Files:
coolkey.spec
Log Message:
Add URL value.
Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coolkey.spec 10 Jun 2006 00:51:08 -0000 1.3
+++ coolkey.spec 12 Jun 2006 20:51:32 -0000 1.4
@@ -22,7 +22,7 @@
Release: 1
Summary: CoolKey PKCS #11 module
License: LGPL
-URL: TBD
+URL: http://directory.fedora.redhat.com/wiki/CoolKey
Source: coolkey-%{version}.tar.gz
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +62,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE
17 years, 9 months
[Fedora-directory-commits] coolkey/src/libckyapplet libckyapplet.pc.in, NONE, 1.1 Makefile.am, 1.1, 1.2 Makefile.in, 1.2, 1.3
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078/src/libckyapplet
Modified Files:
Makefile.am Makefile.in
Added Files:
libckyapplet.pc.in
Log Message:
Package review changes: make libckyapplet a shared library.
--- NEW FILE libckyapplet.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: CoolKey Applet Library
Description: Library to talk to the CoolKey applet.
Version: 1.0.0
Libs: -L${libdir} -lckyapplet
Cflags:
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 9 Jun 2006 18:44:17 -0000 1.1
+++ Makefile.am 10 Jun 2006 00:51:09 -0000 1.2
@@ -24,7 +24,7 @@
AM_CFLAGS =
# bleh what do I add just to get static but pic libraries?
-noinst_LTLIBRARIES = libckyapplet.la
+lib_LTLIBRARIES = libckyapplet.la
libckyapplet_la_SOURCES = \
cky_applet.c \
@@ -35,7 +35,7 @@
quote=\"
-libckyapplet_la_LDFLAGS = -avoid-version
+libckyapplet_la_LDFLAGS = -version-info 1:0:0
libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
nobase_include_HEADERS = \
@@ -49,5 +49,5 @@
cky_basei.h \
dynlink.h
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libckyapplet.pc
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 9 Jun 2006 21:56:35 -0000 1.2
+++ Makefile.in 10 Jun 2006 00:51:09 -0000 1.3
@@ -36,6 +36,7 @@
# Process this file with automake to create Makefile.in
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -61,7 +62,8 @@
target_triplet = @target@
subdir = src/libckyapplet
DIST_COMMON = $(nobase_include_HEADERS) $(noinst_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/libckyapplet.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
@@ -69,8 +71,17 @@
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+CONFIG_CLEAN_FILES = libckyapplet.pc
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pcdir)" \
+ "$(DESTDIR)$(includedir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
libckyapplet_la_LIBADD =
am_libckyapplet_la_OBJECTS = libckyapplet_la-cky_applet.lo \
libckyapplet_la-cky_base.lo libckyapplet_la-cky_card.lo \
@@ -95,13 +106,8 @@
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
+pcDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pc_DATA)
nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
HEADERS = $(nobase_include_HEADERS) $(noinst_HEADERS)
ETAGS = etags
@@ -223,7 +229,7 @@
AM_CFLAGS =
# bleh what do I add just to get static but pic libraries?
-noinst_LTLIBRARIES = libckyapplet.la
+lib_LTLIBRARIES = libckyapplet.la
libckyapplet_la_SOURCES = \
cky_applet.c \
cky_base.c \
@@ -232,7 +238,7 @@
dynlink.c
quote = \"
-libckyapplet_la_LDFLAGS = -avoid-version
+libckyapplet_la_LDFLAGS = -version-info 1:0:0
libckyapplet_la_CFLAGS = $(CFLAGS) -DSCARD_LIB_NAME=$(quote)$(SCARD_LIB_NAME)$(quote) $(PCSC_CFLAGS)
nobase_include_HEADERS = \
cky_base.h \
@@ -245,6 +251,8 @@
cky_basei.h \
dynlink.h
+pcdir = $(libdir)/pkgconfig
+pc_DATA = libckyapplet.pc
all: all-recursive
.SUFFIXES:
@@ -278,17 +286,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+libckyapplet.pc: $(top_builddir)/config.status $(srcdir)/libckyapplet.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libckyapplet.la: $(libckyapplet_la_OBJECTS) $(libckyapplet_la_DEPENDENCIES)
- $(LINK) $(libckyapplet_la_LDFLAGS) $(libckyapplet_la_OBJECTS) $(libckyapplet_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(libdir) $(libckyapplet_la_LDFLAGS) $(libckyapplet_la_OBJECTS) $(libckyapplet_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -367,6 +395,23 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-pcDATA: $(pc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pcdir)" || $(mkdir_p) "$(DESTDIR)$(pcdir)"
+ @list='$(pc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcdir)/$$f'"; \
+ $(pcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcdir)/$$f"; \
+ done
+
+uninstall-pcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pcdir)/$$f"; \
+ done
install-nobase_includeHEADERS: $(nobase_include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
@@ -563,10 +608,10 @@
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pcdir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -595,7 +640,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-recursive
@@ -614,9 +659,9 @@
info-am:
-install-data-am: install-nobase_includeHEADERS
+install-data-am: install-nobase_includeHEADERS install-pcDATA
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-recursive
@@ -642,28 +687,28 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-nobase_includeHEADERS uninstall-pcDATA
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ clean clean-generic clean-libLTLIBRARIES clean-libtool \
clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-nobase_includeHEADERS \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-nobase_includeHEADERS install-pcDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-nobase_includeHEADERS
-
+ uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-nobase_includeHEADERS uninstall-pcDATA
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libckyapplet.pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
17 years, 9 months
[Fedora-directory-commits] coolkey Makefile.in, 1.2, 1.3 config.status, 1.2, 1.3 configure, 1.2, 1.3 configure.in, 1.2, 1.3 coolkey.spec, 1.2, 1.3
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078
Modified Files:
Makefile.in config.status configure configure.in coolkey.spec
Log Message:
Package review changes: make libckyapplet a shared library.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 9 Jun 2006 21:56:34 -0000 1.2
+++ Makefile.in 10 Jun 2006 00:51:08 -0000 1.3
@@ -410,6 +410,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkdir_p) $(distdir)/src/libckyapplet
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.status 9 Jun 2006 21:56:34 -0000 1.2
+++ config.status 10 Jun 2006 00:51:08 -0000 1.3
@@ -271,7 +271,7 @@
_CSEOF
echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
echo >&5
-config_files=" Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+config_files=" Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"
config_headers=" config.h"
config_commands=" depfiles"
@@ -399,6 +399,7 @@
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+ "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
"src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 9 Jun 2006 21:56:34 -0000 1.2
+++ configure 10 Jun 2006 00:51:08 -0000 1.3
@@ -20996,7 +20996,7 @@
- ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+ ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21570,6 +21570,7 @@
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+ "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
"src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in 9 Jun 2006 21:56:34 -0000 1.2
+++ configure.in 10 Jun 2006 00:51:08 -0000 1.3
@@ -191,6 +191,7 @@
AC_CONFIG_FILES([
Makefile
src/libckyapplet/Makefile
+src/libckyapplet/libckyapplet.pc
src/coolkey/Makefile
])
AC_OUTPUT
Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coolkey.spec 9 Jun 2006 21:56:34 -0000 1.2
+++ coolkey.spec 10 Jun 2006 00:51:08 -0000 1.3
@@ -48,7 +48,7 @@
%build
%configure --disable-dependency-tracking
-make %(?_smp_mflags)
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -56,7 +56,8 @@
ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.a
-install -m 755 clib/.libs/libckyapplet.a $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,9 +67,12 @@
%doc ChangeLog LICENSE
%{_libdir}/libcoolkeypk11.so
%{_libdir}/pkcs11/libcoolkeypk11.so
+%{_libdir}/libckyapplet.so.1
+%{_libdir}/libckyapplet.so.1.0.0
%files devel
-%{_libdir}/libckyapplet.a
+%{_libdir}/libckyapplet.so
+%{_libdir}/pkgconfig/libckyapplet.pc
%{_includedir}/*.h
17 years, 9 months
[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in, 1.1, 1.2 dynlink.c, 1.1, 1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10446/src/libckyapplet
Modified Files:
Makefile.in dynlink.c
Log Message:
Build in new tree location.
update .spec file from review comments.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 9 Jun 2006 18:44:17 -0000 1.1
+++ Makefile.in 9 Jun 2006 21:56:35 -0000 1.2
@@ -42,7 +42,7 @@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -59,7 +59,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = clib
+subdir = src/libckyapplet
DIST_COMMON = $(nobase_include_HEADERS) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -258,9 +258,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu clib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libckyapplet/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu clib/Makefile
+ $(AUTOMAKE) --gnu src/libckyapplet/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Index: dynlink.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/dynlink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dynlink.c 9 Jun 2006 18:44:17 -0000 1.1
+++ dynlink.c 9 Jun 2006 21:56:35 -0000 1.2
@@ -17,7 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* ***** END COPYRIGHT BLOCK ***** */
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef WIN32
#include "dynlink_win.c"
17 years, 9 months
[Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.1, 1.2 Makefile.in, 1.1, 1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10446/src/coolkey
Modified Files:
Makefile.am Makefile.in
Log Message:
Build in new tree location.
update .spec file from review comments.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 9 Jun 2006 18:39:11 -0000 1.1
+++ Makefile.am 9 Jun 2006 21:56:34 -0000 1.2
@@ -49,7 +49,7 @@
$(NULL)
libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym
-libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/clib $(PCSC_CFLAGS)
+libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS)
libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 9 Jun 2006 18:39:11 -0000 1.1
+++ Makefile.in 9 Jun 2006 21:56:34 -0000 1.2
@@ -58,7 +58,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = pkcs11/smartcard
+subdir = src/coolkey
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -254,7 +254,7 @@
$(NULL)
libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym
-libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/clib $(PCSC_CFLAGS)
+libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS)
libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@
all: all-recursive
@@ -270,9 +270,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkcs11/smartcard/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/coolkey/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu pkcs11/smartcard/Makefile
+ $(AUTOMAKE) --gnu src/coolkey/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
17 years, 9 months
[Fedora-directory-commits] coolkey Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.1.1.1, 1.2 config.status, 1.1.1.1, 1.2 configure, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2 coolkey.spec, 1.1.1.1, 1.2 libtool, 1.1.1.1, 1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10446
Modified Files:
Makefile.am Makefile.in config.status configure configure.in
coolkey.spec libtool
Log Message:
Build in new tree location.
update .spec file from review comments.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am 9 Jun 2006 18:31:38 -0000 1.1.1.1
+++ Makefile.am 9 Jun 2006 21:56:34 -0000 1.2
@@ -19,7 +19,7 @@
# Process this file with automake to create Makefile.in.
-SUBDIRS = clib pkcs11/smartcard
+SUBDIRS = src/libckyapplet src/coolkey
ACLOCAL_AMFLAGS = -I m4
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in 9 Jun 2006 18:31:31 -0000 1.1.1.1
+++ Makefile.in 9 Jun 2006 21:56:34 -0000 1.2
@@ -14,6 +14,25 @@
@SET_MAKE@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation version
+# 2.1 of the License.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# END COPYRIGHT BLOCK
+
# Process this file with automake to create Makefile.in.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -186,7 +205,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-SUBDIRS = clib pkcs11/smartcard
+SUBDIRS = src/libckyapplet src/coolkey
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST =
DISTCLEANFILES =
Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.status 9 Jun 2006 18:31:38 -0000 1.1.1.1
+++ config.status 9 Jun 2006 21:56:34 -0000 1.2
@@ -271,7 +271,7 @@
_CSEOF
echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
echo >&5
-config_files=" Makefile clib/Makefile pkcs11/smartcard/Makefile"
+config_files=" Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
config_headers=" config.h"
config_commands=" depfiles"
@@ -303,8 +303,8 @@
Report bugs to <bug-autoconf(a)gnu.org>."
ac_cs_version="\
coolkey config.status "1.1.0"
-configured by ./configure, generated by GNU Autoconf 2.59,
- with options \"'--disable-dependency-checking'\"
+configured by configure, generated by GNU Autoconf 2.59,
+ with options \"'--disable-dependency-tracking'\"
Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -383,23 +383,23 @@
fi
if $ac_cs_recheck; then
- echo "running /bin/sh ./configure " '--disable-dependency-checking' $ac_configure_extra_args " --no-create --no-recursion" >&6
- exec /bin/sh ./configure '--disable-dependency-checking' $ac_configure_extra_args --no-create --no-recursion
+ echo "running /bin/sh configure " '--disable-dependency-tracking' $ac_configure_extra_args " --no-create --no-recursion" >&6
+ exec /bin/sh configure '--disable-dependency-tracking' $ac_configure_extra_args --no-create --no-recursion
fi
#
# INIT-COMMANDS section.
#
-AMDEP_TRUE="" ac_aux_dir="."
+AMDEP_TRUE="#" ac_aux_dir="."
for ac_config_target in $ac_config_targets
do
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "clib/Makefile" ) CONFIG_FILES="$CONFIG_FILES clib/Makefile" ;;
- "pkcs11/smartcard/Makefile" ) CONFIG_FILES="$CONFIG_FILES pkcs11/smartcard/Makefile" ;;
+ "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+ "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -502,12 +502,12 @@
s,@CYGPATH_W@,echo,;t t
s,@PACKAGE@,coolkey,;t t
s,@VERSION(a),1.1.0,;t t
-s,@ACLOCAL@,${SHELL} /builds/netkey2/netkey/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /builds/netkey2/netkey/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /builds/netkey2/netkey/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /builds/netkey2/netkey/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /builds/netkey2/netkey/missing --run makeinfo,;t t
-s,@install_sh@,/builds/netkey2/netkey/install-sh,;t t
+s,@ACLOCAL@,${SHELL} /builds/fedora/coolkey/missing --run aclocal-1.9,;t t
+s,@AUTOCONF@,${SHELL} /builds/fedora/coolkey/missing --run autoconf,;t t
+s,@AUTOMAKE@,${SHELL} /builds/fedora/coolkey/missing --run automake-1.9,;t t
+s,@AUTOHEADER@,${SHELL} /builds/fedora/coolkey/missing --run autoheader,;t t
+s,@MAKEINFO@,${SHELL} /builds/fedora/coolkey/missing --run makeinfo,;t t
+s,@install_sh@,/builds/fedora/coolkey/install-sh,;t t
s,@STRIP@,strip,;t t
s,@ac_ct_STRIP@,strip,;t t
s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
@@ -515,7 +515,7 @@
s,@AWK@,gawk,;t t
s,@SET_MAKE@,,;t t
s,@am__leading_dot(a),.,;t t
-s,@AMTAR@,${SHELL} /builds/netkey2/netkey/missing --run tar,;t t
+s,@AMTAR@,${SHELL} /builds/fedora/coolkey/missing --run tar,;t t
s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
s,@am__untar@,${AMTAR} xf -,;t t
s,@MAINTAINER_MODE_TRUE@,#,;t t
@@ -531,18 +531,18 @@
s,@DEPDIR(a),.deps,;t t
s,@am__include@,include,;t t
s,@am__quote@,,;t t
-s,@AMDEP_TRUE@,,;t t
-s,@AMDEP_FALSE@,#,;t t
-s,@AMDEPBACKSLASH@,\,;t t
-s,@CCDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCC_TRUE@,,;t t
-s,@am__fastdepCC_FALSE@,#,;t t
+s,@AMDEP_TRUE@,#,;t t
+s,@AMDEP_FALSE@,,;t t
+s,@AMDEPBACKSLASH@,,;t t
+s,@CCDEPMODE@,depmode=none,;t t
+s,@am__fastdepCC_TRUE@,#,;t t
+s,@am__fastdepCC_FALSE@,,;t t
s,@CXX@,g++,;t t
s,@CXXFLAGS@,-g -O2,;t t
s,@ac_ct_CXX@,g++,;t t
-s,@CXXDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCXX_TRUE@,,;t t
-s,@am__fastdepCXX_FALSE@,#,;t t
+s,@CXXDEPMODE@,depmode=none,;t t
+s,@am__fastdepCXX_TRUE@,#,;t t
+s,@am__fastdepCXX_FALSE@,,;t t
s,@EGREP@,grep -E,;t t
s,@LN_S@,ln -s,;t t
s,@ECHO@,echo,;t t
@@ -552,11 +552,11 @@
s,@ac_ct_RANLIB@,ranlib,;t t
s,@CPP@,gcc -E,;t t
s,@CXXCPP@,g++ -E,;t t
-s,@F77@,g77,;t t
-s,@FFLAGS@,-g -O2,;t t
-s,@ac_ct_F77@,g77,;t t
+s,@F77@,,;t t
+s,@FFLAGS@,,;t t
+s,@ac_ct_F77@,,;t t
s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
-s,@LIBCKYAPPLET(a),${top_builddir}/clib/libckyapplet.la,;t t
+s,@LIBCKYAPPLET(a),${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
s,@PCSC_CFLAGS@,-pthread -I/usr/include/PCSC ,;t t
s,@PCSC_LIBS@,-lpcsclite ,;t t
s,@SCARD_LIB_NAME(a),libpcsclite.so.1,;t t
Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure 9 Jun 2006 18:31:38 -0000 1.1.1.1
+++ configure 9 Jun 2006 21:56:34 -0000 1.2
@@ -425,7 +425,7 @@
PACKAGE_STRING='coolkey "1.1.0"'
PACKAGE_BUGREPORT=''
-ac_unique_file="pkcs11/smartcard/coolkey.cpp"
+ac_unique_file="src/coolkey/coolkey.cpp"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -18937,7 +18937,7 @@
# add our compiled static libraries
-LIBCKYAPPLET="\${top_builddir}/clib/libckyapplet.la"
+LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
PCSC_MSG=no
pcsc_path=/usr
@@ -20996,7 +20996,7 @@
- ac_config_files="$ac_config_files Makefile clib/Makefile pkcs11/smartcard/Makefile"
+ ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21569,8 +21569,8 @@
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "clib/Makefile" ) CONFIG_FILES="$CONFIG_FILES clib/Makefile" ;;
- "pkcs11/smartcard/Makefile" ) CONFIG_FILES="$CONFIG_FILES pkcs11/smartcard/Makefile" ;;
+ "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+ "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure.in 9 Jun 2006 18:31:32 -0000 1.1.1.1
+++ configure.in 9 Jun 2006 21:56:34 -0000 1.2
@@ -24,7 +24,7 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(coolkey,"1.1.0")
-AC_CONFIG_SRCDIR([pkcs11/smartcard/coolkey.cpp])
+AC_CONFIG_SRCDIR([src/coolkey/coolkey.cpp])
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE(coolkey, "1.1.0")
AC_CONFIG_HEADERS([config.h])
@@ -54,7 +54,7 @@
# add our compiled static libraries
AC_SUBST(LIBCKYAPPLET)
-LIBCKYAPPLET="\${top_builddir}/clib/libckyapplet.la"
+LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
PCSC_MSG=no
pcsc_path=/usr
@@ -190,7 +190,7 @@
AC_CONFIG_FILES([
Makefile
-clib/Makefile
-pkcs11/smartcard/Makefile
+src/libckyapplet/Makefile
+src/coolkey/Makefile
])
AC_OUTPUT
Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- coolkey.spec 9 Jun 2006 18:31:34 -0000 1.1.1.1
+++ coolkey.spec 9 Jun 2006 21:56:34 -0000 1.2
@@ -27,10 +27,9 @@
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel
-BuildRequires: zlib
+BuildRequires: zlib-devel
Requires: pcsc-lite
Requires: ifd-egate
-Requires: zlib
Provides: CoolKey Openkey
Obsoletes: CoolKey Openkey
@@ -40,7 +39,6 @@
%package devel
Summary: CoolKey Applet libraries
Group: System Environment/Libraries
-Provides: coolkey-devel
%description devel
Linux Driver support to access the CoolKey applet.
@@ -50,7 +48,7 @@
%build
%configure --disable-dependency-tracking
-make %("_smp_mflags)
+make %(?_smp_mflags)
%install
rm -rf $RPM_BUILD_ROOT
@@ -71,7 +69,7 @@
%files devel
%{_libdir}/libckyapplet.a
-%{_includedir}
+%{_includedir}/*.h
%changelog
Index: libtool
===================================================================
RCS file: /cvs/dirsec/coolkey/libtool,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- libtool 9 Jun 2006 18:31:32 -0000 1.1.1.1
+++ libtool 9 Jun 2006 21:56:34 -0000 1.2
@@ -40,7 +40,7 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# The names of the tagged configurations supported by this script.
-available_tags=" CXX F77"
+available_tags=" CXX"
# ### BEGIN LIBTOOL CONFIG
@@ -6954,311 +6954,3 @@
# ### END LIBTOOL TAG CONFIG: CXX
-# ### BEGIN LIBTOOL TAG CONFIG: F77
-
-# Libtool was configured on host jordan.sfbay.redhat.com:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-redhat-linux-gnu
-host_os=linux-gnu
-
-# The build system.
-build_alias=
-build=i686-redhat-linux-gnu
-build_os=linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="g77"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=32768
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=""
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
- cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
- \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
- \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.2.3/ /usr/lib/gcc/i386-redhat-linux/3.2.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.3/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.2.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.3/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.3/../../../i386-redhat-linux/3.2.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.2.3/../../../ /lib/i386-redhat-linux/3.2.3/ /lib/ /usr/lib/i386-redhat-linux/3.2.3/ /usr/lib/"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/mysql /usr/lib/mysql /usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/lib/mysql /usr/lib/wine "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: F77
-
17 years, 9 months