From: CVS S. <ope...@li...> - 2007-01-24 09:45:58
|
Update of /cvsroot/openca/debian/patches In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27506/patches Modified Files: 04_state_machine_perl_path 05_pub_ca_certs 10_fix_oscpd_conf 20_var_run_dir 30_bigint_serial_cmds 30_bigint_serial_functions 30_bigint_serial_modules_ac 30_bigint_serial_modules_dbi 30_bigint_serial_modules_openssl 30_bigint_serial_modules_pkcs7 Log Message: Effectively nothing have changed. All dpatches were auto regenerated. Author of changes: achetroi Index: 04_state_machine_perl_path =================================================================== RCS file: /cvsroot/openca/debian/patches/04_state_machine_perl_path,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 04_state_machine_perl_path 14 Feb 2006 14:13:08 -0000 1.3 --- 04_state_machine_perl_path 24 Jan 2007 09:45:49 -0000 1.4 *************** *** 9,14 **** Index: src/modules/openca-statemachine/StateMachine.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-statemachine/StateMachine.pm (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/modules/openca-statemachine/StateMachine.pm (.../trunk) (revision 29) @@ -1,4 +1,4 @@ -#!/bin/perl --- 9,14 ---- Index: src/modules/openca-statemachine/StateMachine.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-statemachine/StateMachine.pm (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/modules/openca-statemachine/StateMachine.pm (.../branches/openca-0.9.2) @@ -1,4 +1,4 @@ -#!/bin/perl Index: 05_pub_ca_certs =================================================================== RCS file: /cvsroot/openca/debian/patches/05_pub_ca_certs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 05_pub_ca_certs 14 Feb 2006 14:13:08 -0000 1.3 --- 05_pub_ca_certs 24 Jan 2007 09:45:49 -0000 1.4 *************** *** 10,15 **** Index: src/web-interfaces/pub/htdocs/cacert/Makefile =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/htdocs/cacert/Makefile (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/pub/htdocs/cacert/Makefile (.../trunk) (revision 29) @@ -32,7 +32,7 @@ echo "software update detected, removing old link"; \ --- 10,15 ---- Index: src/web-interfaces/pub/htdocs/cacert/Makefile =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/htdocs/cacert/Makefile (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/pub/htdocs/cacert/Makefile (.../branches/openca-0.9.2) @@ -32,7 +32,7 @@ echo "software update detected, removing old link"; \ *************** *** 23,28 **** Index: src/web-interfaces/pub/htdocs/crl/Makefile =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/htdocs/crl/Makefile (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/pub/htdocs/crl/Makefile (.../trunk) (revision 29) @@ -31,7 +31,7 @@ echo "software update detected, removing old link"; \ --- 23,28 ---- Index: src/web-interfaces/pub/htdocs/crl/Makefile =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/htdocs/crl/Makefile (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/pub/htdocs/crl/Makefile (.../branches/openca-0.9.2) @@ -31,7 +31,7 @@ echo "software update detected, removing old link"; \ Index: 10_fix_oscpd_conf =================================================================== RCS file: /cvsroot/openca/debian/patches/10_fix_oscpd_conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 10_fix_oscpd_conf 14 Feb 2006 14:13:08 -0000 1.2 --- 10_fix_oscpd_conf 24 Jan 2007 09:45:49 -0000 1.3 *************** *** 10,15 **** Index: src/ocspd/docs/ocspd.3.pod =================================================================== ! --- openca-0.9.orig/src/ocspd/docs/ocspd.3.pod (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/ocspd/docs/ocspd.3.pod (.../trunk) (revision 29) @@ -44,7 +44,7 @@ =item B<-c file> --- 10,15 ---- Index: src/ocspd/docs/ocspd.3.pod =================================================================== ! --- openca-0.9.orig/src/ocspd/docs/ocspd.3.pod (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/ocspd/docs/ocspd.3.pod (.../branches/openca-0.9.2) @@ -44,7 +44,7 @@ =item B<-c file> *************** *** 21,28 **** =item B<-md digest> Index: src/ocspd/etc/ocspd.conf.in =================================================================== ! --- openca-0.9.orig/src/ocspd/etc/ocspd.conf.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/ocspd/etc/ocspd.conf.in (.../trunk) (revision 29) @@ -8,14 +8,14 @@ #################################################################### --- 21,47 ---- =item B<-md digest> + Index: src/ocspd/etc/Makefile.am + =================================================================== + --- openca-0.9.orig/src/ocspd/etc/Makefile.am (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/ocspd/etc/Makefile.am (.../branches/openca-0.9.2) + @@ -7,6 +7,7 @@ + $(mkinstalldirs) $(sysconfdir); \ + $(mkinstalldirs) $(sysconfdir)/init.d; \ + $(mkinstalldirs) $(sysconfdir)/ocspd; \ + + $(mkinstalldirs) $(localstatedir)/lib/ocspd; \ + $(mkinstalldirs) $(sysconfdir)/ocspd/certs; \ + $(mkinstalldirs) $(sysconfdir)/ocspd/private; \ + for file in *.conf ; do \ + @@ -15,5 +16,4 @@ + fi \ + done ; \ + $(INSTALL_DATA) rcd.ocspd $(sysconfdir)/init.d ; \ + - $(INSTALL_DATA) index.txt $(sysconfdir)/ocspd + - + + $(INSTALL_DATA) index.txt $(localstatedir)/lib/ocspd Index: src/ocspd/etc/ocspd.conf.in =================================================================== ! --- openca-0.9.orig/src/ocspd/etc/ocspd.conf.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/ocspd/etc/ocspd.conf.in (.../branches/openca-0.9.2) @@ -8,14 +8,14 @@ #################################################################### *************** *** 68,88 **** - +crl_url = file://@localstatedir@/lib/ocspd/crl.pem - Index: src/ocspd/etc/Makefile.am - =================================================================== - --- openca-0.9.orig/src/ocspd/etc/Makefile.am (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/ocspd/etc/Makefile.am (.../trunk) (revision 29) - @@ -7,6 +7,7 @@ - $(mkinstalldirs) $(sysconfdir); \ - $(mkinstalldirs) $(sysconfdir)/init.d; \ - $(mkinstalldirs) $(sysconfdir)/ocspd; \ - + $(mkinstalldirs) $(localstatedir)/lib/ocspd; \ - $(mkinstalldirs) $(sysconfdir)/ocspd/certs; \ - $(mkinstalldirs) $(sysconfdir)/ocspd/private; \ - for file in *.conf ; do \ - @@ -15,5 +16,4 @@ - fi \ - done ; \ - $(INSTALL_DATA) rcd.ocspd $(sysconfdir)/init.d ; \ - - $(INSTALL_DATA) index.txt $(sysconfdir)/ocspd - - - + $(INSTALL_DATA) index.txt $(localstatedir)/lib/ocspd --- 87,88 ---- Index: 20_var_run_dir =================================================================== RCS file: /cvsroot/openca/debian/patches/20_var_run_dir,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 20_var_run_dir 14 Feb 2006 14:13:08 -0000 1.2 --- 20_var_run_dir 24 Jan 2007 09:45:49 -0000 1.3 *************** *** 8,95 **** @DPATCH@ - Index: src/web-interfaces/node/node.conf.in - =================================================================== - --- openca-0.9.orig/src/web-interfaces/node/node.conf.in (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/web-interfaces/node/node.conf.in (.../trunk) (revision 29) - @@ -49,7 +49,7 @@ - - CertDir "@var_prefix@/crypto/certs" - TempDir "@var_prefix@/tmp" - -LOG_DIR "@var_prefix@/log" - +LOG_DIR "@var_log_dir@" - BP_DIR "@var_prefix@/batch" - BP_EXPORT_PKCS12_DIR "@var_prefix@/bp/dataexchange/pkcs12" - MaxReturnedItems 20 - Index: src/common/etc/openca_start.template.in - =================================================================== - --- openca-0.9.orig/src/common/etc/openca_start.template.in (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/etc/openca_start.template.in (.../trunk) (revision 29) - @@ -21,11 +21,13 @@ - $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; - $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; - $AUTOCONF {"var_prefix"} = "@var_prefix@"; - +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; - +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; - $AUTOCONF {"config_prefix"} = "common"; - $AUTOCONF {"VERSION"} = "@VERSION@"; - $AUTOCONF {"PROGRAM"} = "OpenCA Server"; - -$AUTOCONF {"httpd_user"} = "@httpd_user@"; - -$AUTOCONF {"httpd_group"} = "@httpd_group@"; - +$AUTOCONF {"httpd_user"} = "openca"; - +$AUTOCONF {"httpd_group"} = "openca"; - - ## if common.conf is missing then we link common.conf - ## to a random configuration file of an OpenCA interface - Index: src/common/etc/log.xml.in - =================================================================== - --- openca-0.9.orig/src/common/etc/log.xml.in (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/etc/log.xml.in (.../trunk) (revision 29) - @@ -1,6 +1,6 @@ - <openca> - <debug>0</debug> - - <stderr>@var_prefix@/log/stderr.log</stderr> - + <stderr>@var_log_dir@/stderr.log</stderr> - <log> - <debug>0</debug> - <slots> - @@ -20,7 +20,7 @@ - <class>*</class> - <level>*</level> - <logger>XML</logger> - - <dir>@var_prefix@/log/xml</dir> - + <dir>@var_log_dir@/xml</dir> - </slot> - </slots> - </log> - Index: src/common/lib/functions/initCGI - =================================================================== - --- openca-0.9.orig/src/common/lib/functions/initCGI (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/lib/functions/initCGI (.../trunk) (revision 29) - @@ -113,7 +113,7 @@ - - ## connect to server - - -my $socket_name = $AUTOCONF {"var_prefix"}."/tmp/openca_socket"; - +my $socket_name = $AUTOCONF {"var_run_dir"}."/socket/openca_socket"; - socket(SOCK, PF_UNIX, SOCK_STREAM, 0) || sendError ("Cannot create new client socket ($socket_name)."); - connect(SOCK, sockaddr_un($socket_name)) || sendError ("Server is not online or does not accept requests ($socket_name - ".sockaddr_un($socket_name)."). $?"); - - Index: src/web-interfaces/ca/ca.in - =================================================================== - --- openca-0.9.orig/src/web-interfaces/ca/ca.in (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/web-interfaces/ca/ca.in (.../trunk) (revision 29) - @@ -17,6 +17,8 @@ - $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; - $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; - $AUTOCONF {"var_prefix"} = "@var_prefix@"; - +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; - +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; - $AUTOCONF {"config_prefix"} = "@ca_prefix@"; - $AUTOCONF {"VERSION"} = "@VERSION@"; - $AUTOCONF {"PROGRAM"} = "CA Manager"; Index: configure.in =================================================================== ! --- openca-0.9.orig/configure.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/configure.in (.../trunk) (revision 29) @@ -210,6 +210,16 @@ scep_prefix=$withval, scep_prefix=scep) --- 8,15 ---- @DPATCH@ Index: configure.in =================================================================== ! --- openca-0.9.orig/configure.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/configure.in (.../branches/openca-0.9.2) @@ -210,6 +210,16 @@ scep_prefix=$withval, scep_prefix=scep) *************** *** 111,116 **** Index: src/common/etc/config.xml.in =================================================================== ! --- openca-0.9.orig/src/common/etc/config.xml.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/etc/config.xml.in (.../trunk) (revision 29) @@ -416,6 +416,14 @@ <value>@var_prefix@</value> --- 31,36 ---- Index: src/common/etc/config.xml.in =================================================================== ! --- openca-0.9.orig/src/common/etc/config.xml.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/etc/config.xml.in (.../branches/openca-0.9.2) @@ -416,6 +416,14 @@ <value>@var_prefix@</value> *************** *** 128,162 **** <value>@batch_prefix@</value> </option> ! Index: src/web-interfaces/node/node.in ! =================================================================== ! --- openca-0.9.orig/src/web-interfaces/node/node.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/node/node.in (.../trunk) (revision 29) ! @@ -17,6 +17,8 @@ ! $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; ! $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; ! $AUTOCONF {"var_prefix"} = "@var_prefix@"; ! +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; ! +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@node_prefix@"; ! $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "Server Management"; ! Index: src/web-interfaces/ra/RAServer.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/ra/RAServer.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/ra/RAServer.in (.../trunk) (revision 29) ! @@ -17,6 +17,8 @@ ! $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; ! $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; ! $AUTOCONF {"var_prefix"} = "@var_prefix@"; ! +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; ! +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@ra_prefix@"; ! $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "RA Server"; ! Index: src/web-interfaces/scep/scep.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/scep/scep.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/scep/scep.in (.../trunk) (revision 29) ! @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; --- 48,77 ---- <value>@batch_prefix@</value> </option> ! Index: src/common/etc/log.xml.in =================================================================== ! --- openca-0.9.orig/src/common/etc/log.xml.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/etc/log.xml.in (.../branches/openca-0.9.2) ! @@ -1,6 +1,6 @@ ! <openca> ! <debug>0</debug> ! - <stderr>@var_prefix@/log/stderr.log</stderr> ! + <stderr>@var_log_dir@/stderr.log</stderr> ! <log> ! <debug>0</debug> ! <slots> ! @@ -20,7 +20,7 @@ ! <class>*</class> ! <level>*</level> ! <logger>XML</logger> ! - <dir>@var_prefix@/log/xml</dir> ! + <dir>@var_log_dir@/xml</dir> ! </slot> ! </slots> ! </log> ! Index: src/common/etc/openca_start.template.in =================================================================== ! --- openca-0.9.orig/src/common/etc/openca_start.template.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/etc/openca_start.template.in (.../branches/openca-0.9.2) ! @@ -21,11 +21,13 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; *************** *** 164,174 **** +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@scep_prefix@"; $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "SCEP Server"; Index: src/common/etc/openca_stop.template =================================================================== ! --- openca-0.9.orig/src/common/etc/openca_stop.template (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/etc/openca_stop.template (.../trunk) (revision 29) @@ -1,11 +1,11 @@ #!/bin/sh --- 79,96 ---- +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "common"; $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "OpenCA Server"; ! -$AUTOCONF {"httpd_user"} = "@httpd_user@"; ! -$AUTOCONF {"httpd_group"} = "@httpd_group@"; ! +$AUTOCONF {"httpd_user"} = "openca"; ! +$AUTOCONF {"httpd_group"} = "openca"; ! ! ## if common.conf is missing then we link common.conf ! ## to a random configuration file of an OpenCA interface Index: src/common/etc/openca_stop.template =================================================================== ! --- openca-0.9.orig/src/common/etc/openca_stop.template (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/etc/openca_stop.template (.../branches/openca-0.9.2) @@ -1,11 +1,11 @@ #!/bin/sh *************** *** 185,192 **** [ -n "$PID" ] && kill $PID echo done Index: src/common/lib/functions/initServer =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/initServer (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/lib/functions/initServer (.../trunk) (revision 29) @@ -149,17 +149,23 @@ --- 107,127 ---- [ -n "$PID" ] && kill $PID echo done + Index: src/common/lib/functions/initCGI + =================================================================== + --- openca-0.9.orig/src/common/lib/functions/initCGI (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/common/lib/functions/initCGI (.../branches/openca-0.9.2) + @@ -113,7 +113,7 @@ + + ## connect to server + + -my $socket_name = $AUTOCONF {"var_prefix"}."/tmp/openca_socket"; + +my $socket_name = $AUTOCONF {"var_run_dir"}."/socket/openca_socket"; + socket(SOCK, PF_UNIX, SOCK_STREAM, 0) || sendError ("Cannot create new client socket ($socket_name)."); + connect(SOCK, sockaddr_un($socket_name)) || sendError ("Server is not online or does not accept requests ($socket_name - ".sockaddr_un($socket_name)."). $?"); + Index: src/common/lib/functions/initServer =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/initServer (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/lib/functions/initServer (.../branches/openca-0.9.2) @@ -149,17 +149,23 @@ *************** *** 234,241 **** setPerformancePoint ("xml cache activated"); Index: src/web-interfaces/ldap/ldap.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/ldap/ldap.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/ldap/ldap.in (.../trunk) (revision 29) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; --- 169,202 ---- setPerformancePoint ("xml cache activated"); + Index: src/web-interfaces/batch/batch.in + =================================================================== + --- openca-0.9.orig/src/web-interfaces/batch/batch.in (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/web-interfaces/batch/batch.in (.../branches/openca-0.9.2) + @@ -17,6 +17,8 @@ + $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; + $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; + $AUTOCONF {"var_prefix"} = "@var_prefix@"; + +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; + +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; + $AUTOCONF {"config_prefix"} = "@batch_prefix@"; + $AUTOCONF {"VERSION"} = "@VERSION@"; + $AUTOCONF {"PROGRAM"} = "Batch System"; + Index: src/web-interfaces/ca/ca.in + =================================================================== + --- openca-0.9.orig/src/web-interfaces/ca/ca.in (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/web-interfaces/ca/ca.in (.../branches/openca-0.9.2) + @@ -17,6 +17,8 @@ + $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; + $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; + $AUTOCONF {"var_prefix"} = "@var_prefix@"; + +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; + +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; + $AUTOCONF {"config_prefix"} = "@ca_prefix@"; + $AUTOCONF {"VERSION"} = "@VERSION@"; + $AUTOCONF {"PROGRAM"} = "CA Manager"; Index: src/web-interfaces/ldap/ldap.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/ldap/ldap.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/ldap/ldap.in (.../branches/openca-0.9.2) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; *************** *** 247,254 **** $AUTOCONF {"VERSION"} = "@VERSION@"; $AUTOCONF {"PROGRAM"} = "LDAP Administration Gateway"; Index: src/web-interfaces/pub/pki.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/pki.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/pub/pki.in (.../trunk) (revision 29) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; --- 208,241 ---- $AUTOCONF {"VERSION"} = "@VERSION@"; $AUTOCONF {"PROGRAM"} = "LDAP Administration Gateway"; + Index: src/web-interfaces/node/node.conf.in + =================================================================== + --- openca-0.9.orig/src/web-interfaces/node/node.conf.in (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/web-interfaces/node/node.conf.in (.../branches/openca-0.9.2) + @@ -49,7 +49,7 @@ + + CertDir "@var_prefix@/crypto/certs" + TempDir "@var_prefix@/tmp" + -LOG_DIR "@var_prefix@/log" + +LOG_DIR "@var_log_dir@" + BP_DIR "@var_prefix@/batch" + BP_EXPORT_PKCS12_DIR "@var_prefix@/bp/dataexchange/pkcs12" + MaxReturnedItems 20 + Index: src/web-interfaces/node/node.in + =================================================================== + --- openca-0.9.orig/src/web-interfaces/node/node.in (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/web-interfaces/node/node.in (.../branches/openca-0.9.2) + @@ -17,6 +17,8 @@ + $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; + $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; + $AUTOCONF {"var_prefix"} = "@var_prefix@"; + +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; + +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; + $AUTOCONF {"config_prefix"} = "@node_prefix@"; + $AUTOCONF {"VERSION"} = "@VERSION@"; + $AUTOCONF {"PROGRAM"} = "Server Management"; Index: src/web-interfaces/pub/pki.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/pub/pki.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/pub/pki.in (.../branches/openca-0.9.2) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; *************** *** 260,267 **** $AUTOCONF {"VERSION"} = "@VERSION@"; $AUTOCONF {"PROGRAM"} = "PKI Public Server"; ! Index: src/web-interfaces/batch/batch.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/batch/batch.in (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/web-interfaces/batch/batch.in (.../trunk) (revision 29) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; --- 247,254 ---- $AUTOCONF {"VERSION"} = "@VERSION@"; $AUTOCONF {"PROGRAM"} = "PKI Public Server"; ! Index: src/web-interfaces/ra/RAServer.in =================================================================== ! --- openca-0.9.orig/src/web-interfaces/ra/RAServer.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/ra/RAServer.in (.../branches/openca-0.9.2) @@ -17,6 +17,8 @@ $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; *************** *** 270,274 **** +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@batch_prefix@"; $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "Batch System"; --- 257,274 ---- +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@ra_prefix@"; $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "RA Server"; ! Index: src/web-interfaces/scep/scep.in ! =================================================================== ! --- openca-0.9.orig/src/web-interfaces/scep/scep.in (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/web-interfaces/scep/scep.in (.../branches/openca-0.9.2) ! @@ -17,6 +17,8 @@ ! $AUTOCONF {"lib_prefix"} = "@lib_prefix@"; ! $AUTOCONF {"etc_prefix"} = "@etc_prefix@"; ! $AUTOCONF {"var_prefix"} = "@var_prefix@"; ! +$AUTOCONF {"var_run_dir"} = "@var_run_dir@"; ! +$AUTOCONF {"var_log_dir"} = "@var_log_dir@"; ! $AUTOCONF {"config_prefix"} = "@scep_prefix@"; ! $AUTOCONF {"VERSION"} = "@VERSION@"; ! $AUTOCONF {"PROGRAM"} = "SCEP Server"; Index: 30_bigint_serial_cmds =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_cmds,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 30_bigint_serial_cmds 14 Feb 2006 14:13:08 -0000 1.3 --- 30_bigint_serial_cmds 24 Jan 2007 09:45:49 -0000 1.4 *************** *** 8,95 **** @DPATCH@ - Index: src/common/lib/cmds/listCerts - =================================================================== - --- openca-0.9.orig/src/common/lib/cmds/listCerts (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/lib/cmds/listCerts (.../trunk) (revision 29) - @@ -8,8 +8,8 @@ - ## Parameters: dataType, viewFrom, rows - - use strict; - +use Math::BigInt lib => 'GMP'; - - - - sub cmdListCerts { - - ## Reserved variables - @@ -75,10 +75,11 @@ - - my ( $format, $key, $type, $ser_col, $check ); - my @vals; - - my $hex; - + my ( $hex, $ser ); - - $key = $cert->getSerial($dataType); - - $hex = " (0x".sprintf("%X",$key).")"; - + $ser = Math::BigInt->new ($key)->as_hex (); - + $hex = " (".$ser.")"; - $type = $dataType; - - $ser_col = "<a class=\"list\" href=\"$self?cmd=viewCert&dataType=$type" . - Index: src/common/lib/cmds/viewCert - =================================================================== - --- openca-0.9.orig/src/common/lib/cmds/viewCert (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/lib/cmds/viewCert (.../trunk) (revision 29) - @@ -22,6 +22,7 @@ - ## DELETE_PUBLIC_PASSWD - - use strict; - +use Math::BigInt lib => 'GMP'; - - sub cmdViewCert { - - @@ -150,7 +151,8 @@ - $info_list->{BODY}->[$info_pos]->[0] = gettext("Certificate Version"); - $info_list->{BODY}->[$info_pos++]->[1] = ($parsedCert->{VERSION} or gettext("n/a")); - $info_list->{BODY}->[$info_pos]->[0] = gettext("Serial Number"); - - $info_list->{BODY}->[$info_pos++]->[1] = $cert->getSerial()." (0x".sprintf("%X",$cert->getSerial()).")"; - + my $hexser = Math::BigInt->new ($cert->getSerial ())->as_hex (); - + $info_list->{BODY}->[$info_pos++]->[1] = $cert->getSerial()." (".$hexser.")"; - $info_list->{BODY}->[$info_pos]->[0] = gettext("Common Name"); - $info_list->{BODY}->[$info_pos++]->[1] = ($parsedCert->{DN_HASH}->{CN}[0] or gettext("n/a")); - $info_list->{BODY}->[$info_pos]->[0] = gettext("E-Mail"); - Index: src/common/lib/cmds/lists - =================================================================== - --- openca-0.9.orig/src/common/lib/cmds/lists (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/lib/cmds/lists (.../trunk) (revision 29) - @@ -8,6 +8,7 @@ - ## Parameters: action (type of list) - - use strict; - +use Math::BigInt lib => 'GMP'; - - sub cmdLists { - - @@ -140,6 +141,7 @@ - my ( $format, $key, $ser_col, $op_col, $email, $email_col, $role_col ); - my ( $lnk, $parsed, $head ); - my ( $hex, $notBefore, $submit ); - + my $ser; - - my $pos = scalar @{$item_list->{BODY}}; - my $index = 0; - @@ -148,7 +150,8 @@ - $head = $parsed->{HEADER}; - - $key = $dbItem->getSerial(); - - $hex = " (0x".sprintf("%X",$key).")"; - + $ser = Math::BigInt->new ($key)->as_hex (); - + $hex = " (".$ser.")"; - $submit = $parsed->{DN_HASH}->{CN}[0]; - - $notBefore = ( $parsed->{NOTBEFORE} or $head->{NOTBEFORE} Index: src/common/lib/cmds/genCRLfromFile =================================================================== ! --- openca-0.9.orig/src/common/lib/cmds/genCRLfromFile (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/lib/cmds/genCRLfromFile (.../trunk) (revision 29) @@ -9,6 +9,7 @@ ## Cfg KeyWord: OpenCADir,TempDir --- 8,15 ---- @DPATCH@ Index: src/common/lib/cmds/genCRLfromFile =================================================================== ! --- openca-0.9.orig/src/common/lib/cmds/genCRLfromFile (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/lib/cmds/genCRLfromFile (.../branches/openca-0.9.2) @@ -9,6 +9,7 @@ ## Cfg KeyWord: OpenCADir,TempDir *************** *** 170,171 **** --- 90,171 ---- $i->{DN} =~ s/, *([A-Za-z0-9\-]+)=/\/$1=/g; $i->{DN} = "/".$i->{DN}; + Index: src/common/lib/cmds/listCerts + =================================================================== + --- openca-0.9.orig/src/common/lib/cmds/listCerts (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/common/lib/cmds/listCerts (.../branches/openca-0.9.2) + @@ -8,8 +8,8 @@ + ## Parameters: dataType, viewFrom, rows + + use strict; + +use Math::BigInt lib => 'GMP'; + + - + sub cmdListCerts { + + ## Reserved variables + @@ -75,10 +75,11 @@ + + my ( $format, $key, $type, $ser_col, $check ); + my @vals; + - my $hex; + + my ( $hex, $ser ); + + $key = $cert->getSerial($dataType); + - $hex = " (0x".sprintf("%X",$key).")"; + + $ser = Math::BigInt->new ($key)->as_hex (); + + $hex = " (".$ser.")"; + $type = $dataType; + + $ser_col = "<a class=\"list\" href=\"$self?cmd=viewCert&dataType=$type" . + Index: src/common/lib/cmds/lists + =================================================================== + --- openca-0.9.orig/src/common/lib/cmds/lists (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/common/lib/cmds/lists (.../branches/openca-0.9.2) + @@ -8,6 +8,7 @@ + ## Parameters: action (type of list) + + use strict; + +use Math::BigInt lib => 'GMP'; + + sub cmdLists { + + @@ -140,6 +141,7 @@ + my ( $format, $key, $ser_col, $op_col, $email, $email_col, $role_col ); + my ( $lnk, $parsed, $head ); + my ( $hex, $notBefore, $submit ); + + my $ser; + + my $pos = scalar @{$item_list->{BODY}}; + my $index = 0; + @@ -148,7 +150,8 @@ + $head = $parsed->{HEADER}; + + $key = $dbItem->getSerial(); + - $hex = " (0x".sprintf("%X",$key).")"; + + $ser = Math::BigInt->new ($key)->as_hex (); + + $hex = " (".$ser.")"; + $submit = $parsed->{DN_HASH}->{CN}[0]; + + $notBefore = ( $parsed->{NOTBEFORE} or $head->{NOTBEFORE} + Index: src/common/lib/cmds/viewCert + =================================================================== + --- openca-0.9.orig/src/common/lib/cmds/viewCert (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/common/lib/cmds/viewCert (.../branches/openca-0.9.2) + @@ -22,6 +22,7 @@ + ## DELETE_PUBLIC_PASSWD + + use strict; + +use Math::BigInt lib => 'GMP'; + + sub cmdViewCert { + + @@ -150,7 +151,8 @@ + $info_list->{BODY}->[$info_pos]->[0] = gettext("Certificate Version"); + $info_list->{BODY}->[$info_pos++]->[1] = ($parsedCert->{VERSION} or gettext("n/a")); + $info_list->{BODY}->[$info_pos]->[0] = gettext("Serial Number"); + - $info_list->{BODY}->[$info_pos++]->[1] = $cert->getSerial()." (0x".sprintf("%X",$cert->getSerial()).")"; + + my $hexser = Math::BigInt->new ($cert->getSerial ())->as_hex (); + + $info_list->{BODY}->[$info_pos++]->[1] = $cert->getSerial()." (".$hexser.")"; + $info_list->{BODY}->[$info_pos]->[0] = gettext("Common Name"); + $info_list->{BODY}->[$info_pos++]->[1] = ($parsedCert->{DN_HASH}->{CN}[0] or gettext("n/a")); + $info_list->{BODY}->[$info_pos]->[0] = gettext("E-Mail"); Index: 30_bigint_serial_functions =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_functions,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 30_bigint_serial_functions 14 Feb 2006 14:13:08 -0000 1.5 --- 30_bigint_serial_functions 24 Jan 2007 09:45:49 -0000 1.6 *************** *** 8,48 **** @DPATCH@ - Index: src/common/lib/functions/mail-utils.lib - =================================================================== - --- openca-0.9.orig/src/common/lib/functions/mail-utils.lib (.../vendor/releases/openca-0.9.2.5) (revision 29) - +++ openca-0.9/src/common/lib/functions/mail-utils.lib (.../trunk) (revision 29) - @@ -34,6 +34,7 @@ - ## sendPreparedMail 40 - - use strict; - +use Math::BigInt lib => 'GMP'; - - sub warnUsers { - my @keys = @_; - @@ -60,9 +61,10 @@ - my @certsList = split( "\n", $tmp ); - - foreach $ID ( @certsList ) { - - my ($user, $userCert, $serID); - + my ($user, $userCert, $serID, $biSerID); - - ( $serID ) = ( $ID =~ /([a-f0-9]+)/i ); - + $biSerID = Math::BigInt->new ( '0x'.$serID ); - - ##// Let's be sure it is in the right format - $serID = uc( $serID ); - @@ -70,7 +72,7 @@ - - print i18nGettext ("Sending Mail [__CERT_SERIAL__] : <B>Certificate Serial __CERT_SERIAL__ (0x0__HEX__)", - "__CERT_SERIAL__", $serID, - - "__HEX__", hex ($serID)) ."</B><BR>"; - + "__HEX__", $biSerID)."</B><BR>"; - - my $cert = $db->getItem ( DATATYPE => "VALID_CERTIFICATE", - KEY => $serID ); Index: src/common/lib/functions/crypto-utils.lib =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/crypto-utils.lib (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/lib/functions/crypto-utils.lib (.../trunk) (revision 29) @@ -21,6 +21,7 @@ use Locale::Messages (':libintl_h'); --- 8,15 ---- @DPATCH@ Index: src/common/lib/functions/crypto-utils.lib =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/crypto-utils.lib (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/lib/functions/crypto-utils.lib (.../branches/openca-0.9.2) @@ -21,6 +21,7 @@ use Locale::Messages (':libintl_h'); *************** *** 218,223 **** Index: src/common/lib/functions/export-import.lib =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/export-import.lib (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/common/lib/functions/export-import.lib (.../trunk) (revision 29) @@ -6,6 +6,7 @@ --- 185,190 ---- Index: src/common/lib/functions/export-import.lib =================================================================== ! --- openca-0.9.orig/src/common/lib/functions/export-import.lib (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/common/lib/functions/export-import.lib (.../branches/openca-0.9.2) @@ -6,6 +6,7 @@ *************** *** 249,250 **** --- 216,250 ---- $cert_der = $cert->getDER (); $cert_txt = $cert->getTXT (); + Index: src/common/lib/functions/mail-utils.lib + =================================================================== + --- openca-0.9.orig/src/common/lib/functions/mail-utils.lib (.../vendor/releases/openca-0.9.2.5) + +++ openca-0.9/src/common/lib/functions/mail-utils.lib (.../branches/openca-0.9.2) + @@ -34,6 +34,7 @@ + ## sendPreparedMail 40 + + use strict; + +use Math::BigInt lib => 'GMP'; + + sub warnUsers { + my @keys = @_; + @@ -60,9 +61,10 @@ + my @certsList = split( "\n", $tmp ); + + foreach $ID ( @certsList ) { + - my ($user, $userCert, $serID); + + my ($user, $userCert, $serID, $biSerID); + + ( $serID ) = ( $ID =~ /([a-f0-9]+)/i ); + + $biSerID = Math::BigInt->new ( '0x'.$serID ); + + ##// Let's be sure it is in the right format + $serID = uc( $serID ); + @@ -70,7 +72,7 @@ + + print i18nGettext ("Sending Mail [__CERT_SERIAL__] : <B>Certificate Serial __CERT_SERIAL__ (0x0__HEX__)", + "__CERT_SERIAL__", $serID, + - "__HEX__", hex ($serID)) ."</B><BR>"; + + "__HEX__", $biSerID)."</B><BR>"; + + my $cert = $db->getItem ( DATATYPE => "VALID_CERTIFICATE", + KEY => $serID ); Index: 30_bigint_serial_modules_ac =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_modules_ac,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 30_bigint_serial_modules_ac 14 Feb 2006 14:13:08 -0000 1.2 --- 30_bigint_serial_modules_ac 24 Jan 2007 09:45:49 -0000 1.3 *************** *** 9,14 **** Index: src/modules/openca-ac/AC.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-ac/AC.pm (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/modules/openca-ac/AC.pm (.../trunk) (revision 29) @@ -1907,13 +1907,13 @@ --- 9,14 ---- Index: src/modules/openca-ac/AC.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-ac/AC.pm (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/modules/openca-ac/AC.pm (.../branches/openca-0.9.2) @@ -1907,13 +1907,13 @@ Index: 30_bigint_serial_modules_dbi =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_modules_dbi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 30_bigint_serial_modules_dbi 14 Feb 2006 14:20:53 -0000 1.7 --- 30_bigint_serial_modules_dbi 24 Jan 2007 09:45:49 -0000 1.8 *************** *** 10,16 **** Index: src/modules/openca-dbi/DBI.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-dbi/DBI.pm (.../vendor/releases/openca-0.9.2.5) (revision 31) ! +++ openca-0.9/src/modules/openca-dbi/DBI.pm (.../trunk) (revision 31) ! @@ -121,6 +121,37 @@ use DBI; ## lowercase forget the filename). ## ############################################################################ --- 10,16 ---- Index: src/modules/openca-dbi/DBI.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-dbi/DBI.pm (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/modules/openca-dbi/DBI.pm (.../branches/openca-0.9.2) ! @@ -121,6 +121,37 @@ ## lowercase forget the filename). ## ############################################################################ *************** *** 50,54 **** TABLE => { REQUEST => "request", ! @@ -132,17 +163,16 @@ $OpenCA::DBI::SQL = { ## I use here several duplicate array ## somewhere I have to stop the complexity ... --- 50,54 ---- TABLE => { REQUEST => "request", ! @@ -132,17 +163,16 @@ ## I use here several duplicate array ## somewhere I have to stop the complexity ... *************** *** 71,75 **** REQUEST_SERIAL => ["req_key", "BIGINT"], CSR_SERIAL => ["req_key", "BIGINT"], ! @@ -163,11 +193,12 @@ $OpenCA::DBI::SQL = { RAO => ["rao", "TEXT"], Operator => ["rao", "TEXT"], --- 71,75 ---- REQUEST_SERIAL => ["req_key", "BIGINT"], CSR_SERIAL => ["req_key", "BIGINT"], ! @@ -163,11 +193,12 @@ RAO => ["rao", "TEXT"], Operator => ["rao", "TEXT"], *************** *** 86,90 **** SCEP_TID => ["scep_tid", "TEXT"], LOA => ["loa", "TEXT"], ! @@ -216,7 +247,8 @@ $OpenCA::DBI::SQL->{TABLE_STRUCTURE} = "PUBKEY", "NOTAFTER", --- 86,90 ---- SCEP_TID => ["scep_tid", "TEXT"], LOA => ["loa", "TEXT"], ! @@ -216,7 +247,8 @@ "PUBKEY", "NOTAFTER", *************** *** 96,100 **** CA_CERTIFICATE => [ ## real serial senseless because at every time zero ! @@ -228,7 +260,8 @@ $OpenCA::DBI::SQL->{TABLE_STRUCTURE} = "EMAIL", "STATUS", --- 96,100 ---- CA_CERTIFICATE => [ ## real serial senseless because at every time zero ! @@ -228,7 +260,8 @@ "EMAIL", "STATUS", *************** *** 106,110 **** CRR => [ "CRR_SERIAL", ! @@ -505,7 +538,43 @@ $OpenCA::DBI::MODULETYPE = { ## begin of vendordependent databasestuff ## ############################################ --- 106,110 ---- CRR => [ "CRR_SERIAL", ! @@ -505,7 +538,43 @@ ## begin of vendordependent databasestuff ## ############################################ *************** *** 151,155 **** Pg => { TYPE => { ! @@ -514,6 +583,7 @@ $OpenCA::DBI::DB = { LONGTEXT => "text", TEXT_KEY => "text", --- 151,155 ---- Pg => { TYPE => { ! @@ -514,6 +583,7 @@ LONGTEXT => "text", TEXT_KEY => "text", *************** *** 159,163 **** }, DBI_OPTION => { ! @@ -529,6 +599,7 @@ $OpenCA::DBI::DB = { LONGTEXT => "TEXT", TEXT_KEY => "VARCHAR (255)", --- 159,163 ---- }, DBI_OPTION => { ! @@ -529,6 +599,7 @@ LONGTEXT => "TEXT", TEXT_KEY => "VARCHAR (255)", *************** *** 167,171 **** }, DBI_OPTION => {RaiseError => 0, ! @@ -542,7 +613,8 @@ $OpenCA::DBI::DB = { LONGTEXT => "long varchar", ## 255 is the limit for a index key in db2 --- 167,171 ---- }, DBI_OPTION => {RaiseError => 0, ! @@ -542,7 +613,8 @@ LONGTEXT => "long varchar", ## 255 is the limit for a index key in db2 *************** *** 177,181 **** }, DBI_OPTION => { ! @@ -558,6 +630,7 @@ $OpenCA::DBI::DB = { ## 2000 is the limit for varchar in Oracle7 TEXT_KEY => "varchar2 (1999)", --- 177,181 ---- }, DBI_OPTION => { ! @@ -558,6 +630,7 @@ ## 2000 is the limit for varchar in Oracle7 TEXT_KEY => "varchar2 (1999)", *************** *** 185,189 **** }, DBI_OPTION => { ! @@ -1095,8 +1168,14 @@ sub storeItem_getArguments { } --- 185,189 ---- }, DBI_OPTION => { ! @@ -1095,8 +1168,14 @@ } *************** *** 201,205 **** ## enforce status $result {STATUS} = $self->getStatus ( STATUS => $result {STATUS}, ! @@ -1291,6 +1370,8 @@ sub storeItem_update { } } --- 201,205 ---- ## enforce status $result {STATUS} = $self->getStatus ( STATUS => $result {STATUS}, ! @@ -1291,6 +1370,8 @@ } } *************** *** 210,214 **** $bind_values [scalar @bind_values] = $arguments->{NOTAFTER}; } ! @@ -1346,6 +1427,7 @@ sub storeItem_insert { if ($attr !~ /^KEY$/ and $arguments->{$attr}); } --- 210,214 ---- $bind_values [scalar @bind_values] = $arguments->{NOTAFTER}; } ! @@ -1346,6 +1427,7 @@ if ($attr !~ /^KEY$/ and $arguments->{$attr}); } *************** *** 218,222 **** } $query .= ") VALUES ("; ! @@ -1368,6 +1450,8 @@ sub storeItem_insert { } if ($arguments->{TABLE} =~ /CERTIFICATE/i) { --- 218,222 ---- } $query .= ") VALUES ("; ! @@ -1368,6 +1450,8 @@ } if ($arguments->{TABLE} =~ /CERTIFICATE/i) { *************** *** 227,231 **** } $query .= ")"; ! @@ -1474,7 +1558,7 @@ sub getItem { $bind_values [0] = $arguments{KEY}; } else { --- 227,231 ---- } $query .= ")"; ! @@ -1474,7 +1558,7 @@ $bind_values [0] = $arguments{KEY}; } else { *************** *** 236,240 **** undef @bind_values; } ! @@ -1899,8 +1983,11 @@ sub searchItems { # new one !!! } --- 236,240 ---- undef @bind_values; } ! @@ -1899,8 +1983,11 @@ } *************** *** 250,254 **** $self->debug ("searchItems: query: $query"); ! @@ -2029,8 +2116,11 @@ sub listItems { $bind_values [scalar @bind_values] = $arguments{STATUS}; $query .= $self->handleExpiredCert ( \%arguments ) if ($arguments{NOTAFTER}); --- 250,254 ---- $self->debug ("searchItems: query: $query"); ! @@ -2029,8 +2116,11 @@ $bind_values [scalar @bind_values] = $arguments{STATUS}; $query .= $self->handleExpiredCert ( \%arguments ) if ($arguments{NOTAFTER}); Index: 30_bigint_serial_modules_openssl =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_modules_openssl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 30_bigint_serial_modules_openssl 14 Feb 2006 14:13:08 -0000 1.3 --- 30_bigint_serial_modules_openssl 24 Jan 2007 09:45:49 -0000 1.4 *************** *** 9,14 **** Index: src/modules/openca-openssl/OpenSSL.xs =================================================================== ! --- openca-0.9.orig/src/modules/openca-openssl/OpenSSL.xs (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/modules/openca-openssl/OpenSSL.xs (.../trunk) (revision 29) @@ -71,15 +71,11 @@ --- 9,14 ---- Index: src/modules/openca-openssl/OpenSSL.xs =================================================================== ! --- openca-0.9.orig/src/modules/openca-openssl/OpenSSL.xs (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/modules/openca-openssl/OpenSSL.xs (.../branches/openca-0.9.2) @@ -71,15 +71,11 @@ Index: 30_bigint_serial_modules_pkcs7 =================================================================== RCS file: /cvsroot/openca/debian/patches/30_bigint_serial_modules_pkcs7,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 30_bigint_serial_modules_pkcs7 14 Feb 2006 14:13:08 -0000 1.3 --- 30_bigint_serial_modules_pkcs7 24 Jan 2007 09:45:49 -0000 1.4 *************** *** 9,14 **** Index: src/modules/openca-pkcs7/PKCS7.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-pkcs7/PKCS7.pm (.../vendor/releases/openca-0.9.2.5) (revision 29) ! +++ openca-0.9/src/modules/openca-pkcs7/PKCS7.pm (.../trunk) (revision 29) @@ -65,6 +65,7 @@ use strict; --- 9,14 ---- Index: src/modules/openca-pkcs7/PKCS7.pm =================================================================== ! --- openca-0.9.orig/src/modules/openca-pkcs7/PKCS7.pm (.../vendor/releases/openca-0.9.2.5) ! +++ openca-0.9/src/modules/openca-pkcs7/PKCS7.pm (.../branches/openca-0.9.2) @@ -65,6 +65,7 @@ use strict; |