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