← Back to branch summary

~ubuntu-branches/ubuntu/quantal/openvpn/quantal-proposed

« back to all changes in this revision

Viewing changes to install-win32/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-31 04:55:56 UTC
  • mfrom: (1.1.18) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20111231045556-3fwmrbggevr9iqxd
Tags: 2.2.1-3ubuntu1
https://launchpad.net/bugs/794916
* Merge from Debian testing.  Remaining changes:
 + debian/openvpn.init.d:
    - Do not use start-stop-daemon and </dev/null to avoid blocking boot.
    - Show per-VPN result messages.
    - Add "--script-security 2" by default for backwards compatabliity.
  + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc()
  + debian/update-resolv-conf: Support multiple domains.
  + fix bug where '--script-security 2' would be passed for all
    daemons after the first. (LP: #794916)

Show diffs side-by-side

added added

removed removed

Lines of Context:
install-win32/Makefile.am
57
57
 
58
58
confdir = $(win32datadir)/config
59
59
nodist_conf_DATA = \
60
 
        tmp/openssl.cnf.sample \
 
60
        tmp/openssl-1.0.0.cnf \
61
61
        tmp/client.ovpn \
62
62
        tmp/server.ovpn
63
63
dist_conf_DATA = \
83
83
tmp/license.txt:        tmp $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL
84
84
        cat $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL > tmp/license.txt
85
85
 
86
 
tmp/openssl.cnf.sample: tmp $(top_srcdir)/easy-rsa/2.0/openssl.cnf
87
 
        cp $(top_srcdir)/easy-rsa/2.0/openssl.cnf tmp/openssl.cnf.sample
 
86
tmp/openssl-1.0.0.cnf:  tmp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf
 
87
        cp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf tmp/openssl-1.0.0.cnf
88
88
 
89
89
clean-local:
90
90
        -rm -fr tmp