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, core65 has been updated via 220c93308985f3e3df4d689a08cf17359f9fb35b (commit) via b88cd7caa1a8b2975804ff2923fd98c1a4eb1640 (commit) via 51379603c8161d5ef6ede182251789d098a3d833 (commit) from 95d87c3ed9ad39614a1c9449d96c9f4e5f066922 (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 220c93308985f3e3df4d689a08cf17359f9fb35b Merge: 95d87c3 b88cd7c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 17 16:10:02 2012 +0100

Merge branch 'master' into core65

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

Summary of changes: config/rootfiles/common/configroot | 4 ++++ lfs/configroot | 4 ++-- lfs/samba | 6 +++--- src/scripts/ovpn-ccd-convert | 1 + 4 files changed, 10 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e14f7e0..1d2fc9d 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules #var/ipfire/outgoing/settings +var/ipfire/ovpn +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 var/ipfire/pakfire #var/ipfire/pakfire/settings #var/ipfire/patches diff --git a/lfs/configroot b/lfs/configroot index 90f5afa..f8fe426 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -53,7 +53,7 @@ $(TARGET) : for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ - outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \ + outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ wakeonlan wireless xtaccess ; do \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ - pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ + ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ diff --git a/lfs/samba b/lfs/samba index 84a8a2b..ed4554a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@

include Config

-VER = 3.5.19 +VER = 3.5.20

THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 43 +PAK_VER = 44

DEPS = "cups"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff +$(DL_FILE)_MD5 = 5ac0420b2e7336f902204bcef3319b9f

install : $(TARGET)

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index c54e256..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -48,3 +48,4 @@ if ($running eq 'on') { system('/usr/local/bin/openvpnctrl', '-s'); } +system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");

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