kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Honor PKG_SYSCONFDIR.

Browse source 
- move store directory to under PKG_SYSCONFDIR.
- add missing fix to top level configure.
This commit is contained in:
taca 2004-11-30 05:58:04 +00:00
parent 192053414d
commit 153867708e
9 changed files with 135 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
security/AiCA/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/11/29 17:24:49 taca Exp $
# $NetBSD: Makefile,v 1.8 2004/11/30 05:58:04 taca Exp $
#
DISTNAME= AiCA-0.81
@ -15,18 +15,21 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/AiCA
CONFDIR= ${PREFIX}/etc/AiCA
DOCDIR= ${PREFIX}/share/doc/AiCA
EXAMPLESDIR= ${PREFIX}/share/examples/AiCA
PKG_SYSCONFSUBDIR?= AiCA
CONF_FILES+= ${EXAMPLESDIR}/aica.cnf ${PKG_SYSCONFDIR}/aica.cnf
OWN_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/store
CONF_FILES+= ${EXAMPLESDIR}/aica.cnf ${CONFDIR}/aica.cnf
OWN_DIRS+= ${CONFDIR}/store ${MAKE_DIRS}
DOCDIR= ${PREFIX}/share/doc/AiCA
EXAMPLESDIR= ${PREFIX}/share/examples/AiCA
COMMANDS= aica/aica bin/aistore bin/asn1view bin/certconv \
bin/certreq bin/certvfy bin/certview
LIBRARIES= libaica.a libaicrypto.a libaissl.a
DOCS= COPYRIGHT README README.j
EXAMPLES= lib/aica.cnf sample.csv
COMMANDS= aica/aica bin/aistore bin/asn1view bin/certconv \
bin/certreq bin/certvfy bin/certview
LIBRARIES= libaica.a libaicrypto.a libaissl.a
DOCS= COPYRIGHT README README.j
EXAMPLES= lib/aica.cnf sample.csv
pre-configure:
cd ${WRKSRC}; \
${CP} README README.in; ${CP} README.j README.j.in
do-install:
.for f in ${LIBRARIES}

15
security/AiCA/distinfo
View file

@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.3 2004/11/29 17:24:49 taca Exp $
$NetBSD: distinfo,v 1.4 2004/11/30 05:58:04 taca Exp $
SHA1 (AiCA-0.81.tar.gz) = aa74edda60b29f21cca17ff6b09b07509705db18
Size (AiCA-0.81.tar.gz) = 703433 bytes
SHA1 (patch-aa) = e05d26c1a8248ac757e5f98da2fcc643629bc440
SHA1 (patch-ab) = 0a94ee9e5c434c34980f6f8798e689c647bc9cd5
SHA1 (patch-ac) = 5b9d8ca4ceeb1319e72bc46b0b31e43def1bb9b1
SHA1 (patch-ad) = 05985ad03ae87440ee45490d02e2d1ad3cde9be4
SHA1 (patch-ae) = 0dde826a366e8dbaf664d83e517e6c4d9b7a9e77
SHA1 (patch-af) = 36ce280f9c19f5fadd9675acfbd826a4fdfbb2f5
SHA1 (patch-aa) = 45878a0aa80b3201c4e3e7c4d1fc593412745855
SHA1 (patch-ab) = 524c4f8ca5daaea0c28d113ddf94fac52c2deeac
SHA1 (patch-ac) = efff74bf4bc97c427b8a975d9cc81db721504cbe
SHA1 (patch-ad) = e8a83263d262a7587876c2f972a79f0666df85f9
SHA1 (patch-ae) = 514aa2677078acdfb0105ebfe2ea3b45dac9ecc7
SHA1 (patch-af) = 698fa9e68a9c90d1bedc4320e554a324b76e5bc8
SHA1 (patch-ag) = 4f557ebd4b82d1e99ae02eff57987e2c53d00e13

19
security/AiCA/patches/patch-aa
View file

@ -1,13 +1,24 @@
$NetBSD: patch-aa,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-aa,v 1.2 2004/11/30 05:58:04 taca Exp $
--- README.j.orig 2002-11-04 23:21:08.000000000 +0900
+++ README.j
@@ -96,7 +96,7 @@
@@ -96,8 +96,8 @@
発行された証明書をディレクトリの中に、自分でコピーをして下さい。
2.3 aica.cnfの設定
- AiCAをインストールすると、そのインストールディレクトリに libディレクトリ
+ AiCAをインストールすると、PREFIX/etcディレクトリにAiCAディレクトリ
が作成されます。この中に、AiCAの動作設定をする aica.cnf があります。
- が作成されます。この中に、AiCAの動作設定をする aica.cnf があります。
+ AiCAをインストールすると、/usr/pkg/etc/AiCAディレクトリが作成されます。
+ この中に、AiCAの動作設定をする aica.cnf があります。
2.3.1 default CAの設定
ここで通常使うCAを設定します。
@@ -126,7 +126,7 @@
2.3.3 general infoの設定
証明書の保存や検証に使用する証明書ストアのディレクトリを設定します。
[general info]
- store_dir =(インストール先)/store
+ store_dir =/usr/pkg/etc/AiCA/store
初期の設定では、インストールディレクトリ以下の store ディレクトリに
証明書ストアのデータファイルを保存します。特に変更する必要がなければ、
このままの設定にしてください。

19
security/AiCA/patches/patch-ab
View file

@ -1,13 +1,24 @@
$NetBSD: patch-ab,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-ab,v 1.2 2004/11/30 05:58:04 taca Exp $
--- README.orig 2002-11-04 23:21:08.000000000 +0900
+++ README
@@ -103,7 +103,7 @@
@@ -103,8 +103,8 @@
operations.
2.3 Settings of aica.cnf
- After installation of the AiCA, "PREFIX/lib/aica.cnf" file will be
+ After installation of the AiCA, "PREFIX/etc/AiCA/aica.cnf" file will be
created for command configuration. ("PREFIX" means install directory)
- created for command configuration. ("PREFIX" means install directory)
+ After installation of the AiCA, "/usr/pkg/etc/AiCA/aica.cnf" file will be
+ created for command configuration.
2.3.1 Settings of "default CA"
Set the default CA.
@@ -135,7 +135,7 @@
It is neccessary to define certificate store directory which is
containing certificates and CRLs for certificate verification.
[general info]
- store_dir =PREFIX/store
+ store_dir =/usr/pkg/etc/AiCA/store
By default setting, store_dir is 'install_directory/store' and this
directory contains several files of aica certificate store. Use default
setting if you do not have any special reason.

4
security/AiCA/patches/patch-ac
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-ac,v 1.2 2004/11/30 05:58:04 taca Exp $
--- aica/Makefile.in.orig 2002-11-04 23:21:09.000000000 +0900
+++ aica/Makefile.in
@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2004/11/29 17:24:49 taca Exp $
CC= @CC@
PREFIX= @prefix@
-CFLAGS= -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"$(PREFIX)/lib/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
+CFLAGS= -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"$(PREFIX)/etc/AiCA/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
+CFLAGS= -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"${PKG_SYSCONFDIR}/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
OBJ= aica.o aica_file.o aica_print.o aica_setext.o aica_pol.o \

26
security/AiCA/patches/patch-ad
View file

@ -1,13 +1,29 @@
$NetBSD: patch-ad,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-ad,v 1.2 2004/11/30 05:58:04 taca Exp $
--- aicrypto/configure.orig 2002-11-04 23:21:10.000000000 +0900
+++ aicrypto/configure
@@ -633,7 +633,7 @@ EOF
@@ -642,6 +642,24 @@ EOF
#define UC_LOCAL_JCODE 3
EOF
;;
- freebsd*)
+ freebsd*|netbsd*|openbsd*)
+ netbsd*)
+ cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define UC_LOCAL_JCODE 3
+EOF
+ ;;
+ openbsd*)
+ cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define UC_LOCAL_JCODE 3
+EOF
+ ;;
bsdi*)
cat >> confdefs.h <<\EOF
#define __BSD__ 1
EOF

4
security/AiCA/patches/patch-ae
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ae,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-ae,v 1.2 2004/11/30 05:58:04 taca Exp $
--- apps/Makefile.in.orig 2002-11-04 23:21:38.000000000 +0900
+++ apps/Makefile.in
@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 2004/11/29 17:24:49 taca Exp $
CC= @CC@
PREFIX= @prefix@
-CFLAGS= -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"$(PREFIX)/lib/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
+CFLAGS= -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"$(PREFIX)/etc/AiCA/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
+CFLAGS= -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"${PKG_SYSCONFDIR}/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
ASN1VW= asn1view.o p12.o

4
security/AiCA/patches/patch-af
View file

@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.1 2004/11/29 17:24:49 taca Exp $
$NetBSD: patch-af,v 1.2 2004/11/30 05:58:04 taca Exp $
--- lib/aica.cnf.in.orig 2002-11-04 23:21:40.000000000 +0900
+++ lib/aica.cnf.in
@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1 2004/11/29 17:24:49 taca Exp $
# default certificate store directory
[general info]
-store_dir =@prefix@/store
+store_dir =@prefix@/etc/AiCA/store
+store_dir =@PKG_SYSCONFDIR@/store
[general info end]

56
security/AiCA/patches/patch-ag Normal file
View file

@ -0,0 +1,56 @@
$NetBSD: patch-ag,v 1.1 2004/11/30 05:58:04 taca Exp $
--- configure.orig 2002-11-04 23:21:09.000000000 +0900
+++ configure
@@ -659,6 +659,24 @@ EOF
#define UC_LOCAL_JCODE 3
EOF
;;
+ netbsd*)
+ cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define UC_LOCAL_JCODE 3
+EOF
+ ;;
+ openbsd*)
+ cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define UC_LOCAL_JCODE 3
+EOF
+ ;;
bsdi*)
cat >> confdefs.h <<\EOF
#define __BSD__ 1
@@ -1434,6 +1452,9 @@ else
fi
done
+if test -z "${PKG_SYSCONFDIR}"; then
+ PKG_SYSCONFDIR="`eval echo \`echo ${sysconfdir}\``/AiCA"
+fi
trap '' 1 2 15
cat > confcache <<\EOF
@@ -1569,6 +1590,7 @@ s%@sbindir@%$sbindir%g
s%@libexecdir@%$libexecdir%g
s%@datadir@%$datadir%g
s%@sysconfdir@%$sysconfdir%g
+s%@PKG_SYSCONFDIR@%$PKG_SYSCONFDIR%g
s%@sharedstatedir@%$sharedstatedir%g
s%@localstatedir@%$localstatedir%g
s%@libdir@%$libdir%g
@@ -1635,7 +1657,7 @@ aicrypto/lnm/Makefile aicrypto/pkcs/Make
aicrypto/asn1/Makefile aicrypto/x509/Makefile aicrypto/utf8/Makefile
aicrypto/tool/Makefile aicrypto/cmp/Makefile aicrypto/store/Makefile
aicrypto/smime/Makefile aicrypto/ssl/Makefile aicrypto/lib/Makefile
-aicrypto/Makefile ca/Makefile apps/Makefile aica/Makefile lib/aica.cnf Makefile"}
+aicrypto/Makefile ca/Makefile apps/Makefile aica/Makefile lib/aica.cnf Makefile" README README.j}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then