OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Feb-2003 14:05:32
Branch: HEAD Handle: 2003020513052803
Added files:
openpkg-src/aica aica.cnf
Modified files:
openpkg-src/aica aica.spec
openpkg-web news.txt
Log:
lots of polishing
Summary:
Revision Changes Path
1.1 +25 -0 openpkg-src/aica/aica.cnf
1.3 +34 -10 openpkg-src/aica/aica.spec
1.3201 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aica/aica.cnf
============================================================================
$ cvs diff -u -r0 -r1.1 aica.cnf
--- /dev/null 2003-02-05 14:05:31.000000000 +0100
+++ aica.cnf 2003-02-05 14:05:31.000000000 +0100
@@ -0,0 +1,25 @@
+# AiCA configure file.
+
+# default certificate store directory
+[general info]
+store_dir =@l_prefix@/var/aica/certs
+[general info end]
+
+# "aica" configure
+# default CA directory.
+[default CA]
+ca_dir =.
+[default CA end]
+
+# "certreq" configure
+# default subject DIR
+[subject DN]
+C =country
+ST =state
+L =location
+O =organization
+OU =unit
+CN =test
+EMAIL =test@localhost
+[subject DN end]
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aica/aica.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 aica.spec
--- openpkg-src/aica/aica.spec 4 Feb 2003 18:01:37 -0000 1.2
+++ openpkg-src/aica/aica.spec 5 Feb 2003 13:05:31 -0000 1.3
@@ -33,10 +33,11 @@
Group: Security
License: AiCrypto
Version: 0.81
-Release: 20030204
+Release: 20030205
# list of sources
Source0: http://mars.elcom.nitech.ac.jp/security/AiCA-%{version}.tar.gz
+Source1: aica.cnf
%NoSource 0
# build information
@@ -58,15 +59,38 @@
%setup -q -n AiCA
%build
+ # change path to templates and vendor certs
%{l_shtool} subst \
- -e 's;/store;/etc/aica/certs;g' \
- lib/aica.cnf.in
+ -e 's;strncpy(buf,PREFIX;strncpy(buf,"%{l_prefix}/lib/aica";' \
+ aica/aica_conf.c
+
+ # change path to config file
for f in */Makefile.in; do
%{l_shtool} subst \
-e 's;/lib/aica.cnf;/etc/aica/aica.cnf;g' \
$f
done
+ # change default path to certificates
+ %{l_shtool} subst \
+ -e 's;"%s/certs",PREFIX;"%s/certs","%{l_prefix}/lib/aica";' \
+ aicrypto/ssl/ssl_vfy.c
+
+ # mangle dangerous filenames that contain whitespace
+ for f in templates/*; do
+ mv "$f" `echo "$f" | sed -e 's/ /_/g'`
+ done
+ # patch source to reference mangled filenames
+ %{l_shtool} subst \
+ -e 's;"ARL Profile template";"ARL_Profile_template";g' \
+ -e 's;"CRL Profile template";"CRL_Profile_template";g' \
+ -e 's;"CRL-All Profile template";"CRL-All_Profile_template";g' \
+ -e 's;"Sub-CA Profile template";"Sub-CA_Profile_template";g' \
+ -e 's;"SMIME user Profile template";"SMIME_user_Profile_template";g' \
+ -e 's;"Cross Cert Profile template";"Cross_Cert_Profile_template";g' \
+ aica/aica_new.c \
+ ca/ca_asn1.c
+
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -81,10 +105,10 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/lib \
$RPM_BUILD_ROOT%{l_prefix}/etc/aica \
- $RPM_BUILD_ROOT%{l_prefix}/etc/aica/certs \
$RPM_BUILD_ROOT%{l_prefix}/include/aica \
$RPM_BUILD_ROOT%{l_prefix}/lib/aica/certs \
$RPM_BUILD_ROOT%{l_prefix}/lib/aica/templates \
+ $RPM_BUILD_ROOT%{l_prefix}/var/aica/certs \
$RPM_BUILD_ROOT%{l_prefix}/share/aica
%{l_shtool} install -c -s -m 755 \
aica/aica \
@@ -102,7 +126,8 @@
lib/lib*.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/
%{l_shtool} install -c -m 644 \
- lib/aica.cnf \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE aica.cnf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/aica/
%{l_shtool} install -c -m 644 \
aicrypto/include/* \
@@ -111,10 +136,6 @@
%{l_shtool} install -c -m 644 \
certs/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/aica/certs/
- # DANGER: templates/* expands to filenames with whitespace
- for f in templates/*; do
- mv "$f" `echo "$f" | sed -e 's/ /_/g'`
- done
%{l_shtool} install -c -m 644 \
templates/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/aica/templates/
@@ -122,7 +143,10 @@
COPYRIGHT \
README \
$RPM_BUILD_ROOT%{l_prefix}/share/aica/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%config %{l_prefix}/etc/aica/aica.cnf' \
+ '%attr(1777,%{l_musr},%{l_mgrp}) %{l_prefix}/var/aica'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3200 -r1.3201 news.txt
--- openpkg-web/news.txt 5 Feb 2003 10:33:43 -0000 1.3200
+++ openpkg-web/news.txt 5 Feb 2003 13:05:28 -0000 1.3201
@@ -1,3 +1,4 @@
+05-Feb-2003: Upgraded package: P<aica-0.81-20030205>
05-Feb-2003: Upgraded package: P<gcc-3.2.2-20030205>
05-Feb-2003: Upgraded package: P<vim-6.1.320-20030205>
05-Feb-2003: Upgraded package: P<tidy-20030203-20030205>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
