[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 33a1b286084cf0745aced5f17c86e39b41859c40

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 33a1b286084cf0745aced5f17c86e39b41859c40

[git]

[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  33a1b286084cf0745aced5f17c86e39b41859c40 (commit)
       via  ea6d6642a9520469dd845b52a860017844f7c67b (commit)
       via  61719727b43fb4e323da652eaa6619778e70f799 (commit)
      from  fd71513f75bfe0af6cb1e69ccb8df75957d131da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33a1b286084cf0745aced5f17c86e39b41859c40
Merge: fd71513 ea6d664
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 4 11:49:01 2014 +0100

    Merge remote-tracking branch 'origin/master' into fifteen

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/75/filelists/files | 1 +
 lfs/openvpn                              | 1 +
 2 files changed, 2 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
index 647eb26..460db7d 100644
--- a/config/rootfiles/core/75/filelists/files
+++ b/config/rootfiles/core/75/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/lib/openvpn/verify
 var/ipfire/header.pl
 var/ipfire/langs
diff --git a/lfs/openvpn b/lfs/openvpn
index 727d374..053d581 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chmod 660 /var/log/ovpnserver.log
 	chmod 700 /var/ipfire/ovpn/certs
 	mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
+	chown root:root /usr/lib/openvpn/verify
 	chmod 755 /usr/lib/openvpn/verify
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree