]>
Commit | Line | Data |
---|---|---|
b2839a90 | 1 | --- freeswan-1.97/utils/Makefile Mon Apr 1 22:05:27 2002 |
2 | +++ freeswan-1.97/utils/Makefile.org Wed May 1 18:41:09 2002 | |
3 | @@ -71,17 +71,19 @@ | |
493ad024 | 4 | |
5 | # generate RSA private key... if, and only if, /etc/ipsec.secrets does | |
6 | # not already exist | |
7 | -BLURB=-- not filled in because ipsec.secrets existed at build time -- | |
8 | +# BLURB=-- not filled in because ipsec.secrets existed at build time -- | |
b2839a90 | 9 | +# |
10 | +# This will be done in %post in spec file | |
493ad024 | 11 | secrets.eg: secrets.proto ranbits rsasigkey |
12 | - rm -f $@ | |
13 | - umask 077 ; ( \ | |
14 | - sed '/yyy/,$$d' secrets.proto ; \ | |
15 | - if test ! -f $(CONFDIR)/ipsec.secrets ; \ | |
16 | - then ./rsasigkey --verbose $(RSAKEYBITS) ; \ | |
17 | - else echo " # $(BLURB)" ; \ | |
18 | - fi ; \ | |
19 | - sed '1,/yyy/d' secrets.proto ; \ | |
20 | - ) | egrep -v RCSID >$@ | |
21 | +# rm -f $@ | |
22 | +# umask 077 ; ( \ | |
23 | +# sed '/yyy/,$$d' secrets.proto ; \ | |
24 | +# if test ! -f $(CONFDIR)/ipsec.secrets ; \ | |
25 | +# then ./rsasigkey --verbose $(RSAKEYBITS) ; \ | |
26 | +# else echo " # $(BLURB)" ; \ | |
27 | +# fi ; \ | |
28 | +# sed '1,/yyy/d' secrets.proto ; \ | |
29 | +# ) | egrep -v RCSID >$@ | |
30 | ||
31 | # force full secrets-file build | |
32 | newsecrets: | |
b2839a90 | 33 | @@ -106,8 +108,8 @@ |
493ad024 | 34 | $(INSTMAN) $(PUB) $$f $(CMANDIR)/ipsec_$$f || exit 1 ; \ |
35 | ./manlink $(CMANDIR) ipsec_$$f ; \ | |
36 | done | |
37 | - test -f $(CONFDIR)/ipsec.secrets || \ | |
38 | - $(INSTCONF) $(PRIV) secrets.eg $(CONFDIR)/ipsec.secrets | |
39 | +# test -f $(CONFDIR)/ipsec.secrets || \ | |
40 | +# $(INSTCONF) $(PRIV) secrets.eg $(CONFDIR)/ipsec.secrets | |
41 | test -f $(CONFDIR)/ipsec.conf || \ | |
42 | $(INSTCONF) $(PUB) conf.eg $(CONFDIR)/ipsec.conf | |
43 | # main copy must go in RCDIR, BINDIR may not be mounted at boot time |