initnss: fix bug #76: ipsec initnss fails with a @FINALCONFDDIR@ replace and
no default configdir
update changes for bug #76 fix
ipsec: cleanup coding style
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

Conflicts:
	Makefile.inc
ipsec: use environment variable in script
Revert "* Pass traffic selectors to the kernel in Transport Mode"

This reverts commit 9ed4d3e9ca2f57872167149c633f7ee2a3b01549.

This patch was quite badly wrong and caused natted transport mode
to break up completely.
* SAref patches for RHEL/CentOS 2.6.32-358.2.1

Signed-off-by: Paul Wouters <pwouters@redhat.com>
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
* KLIPS: SAref patches for 3.0.55+ kernels

This takes into account changes made by upstream in:

http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/net/ipv4/ip_sockglue.c?h=linux-3.0.y&id=26aeb8bdda7619453e0958e8c38a84c7add3643b

Signed-off-by: Paul Wouters <pwouters@redhat.com>
* packaging: Split RHEL spec files into rhel5/rhel6 versions

Also added OCF support as an option.
* packaging: rhel5 has no %{_isa} macro and no nss-softokn
*testing : rename test output file, fixed and pluto log files
	east.console.verbose.txt fixed file east.console.txt
	pluto logs are east.pluto.log
ipsec: fix syntax error in --help
update changes for ipsec --help fix
initsystem: fixed default sysv init status function
verify: fix wrong confdir location
update changes for VERIFY confdir location
* pluto: clear out old logfile on restart

Don't append. Old behaviour was to start a new file and is preferred.
* _stackmanager: flush netkey unconditionally upon restart

It seemed sometimes we did end up with some leftovers from the
previous run, causing module unload failure and lingering unknown
internal state. To prevent that, we unconditionally flush state and policy now
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan