From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch,
	master, updated. 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c
Date: Wed, 02 May 2012 10:25:48 +0200
Message-ID: <20120502082558.E236820084@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4671070587462283580=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============4671070587462283580==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, master has been updated
       via  9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c (commit)
      from  de887913ee5c688b8500ec7f6dbe376ce436d492 (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 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 2 10:10:07 2012 +0200

    samba: security update to 3.5.15. (CVE-2012-2111).
   =20
    This security release addresses CVE-2012-2111 (incorrect permission check=
s when
    granting/removing privileges could compromise file server security).

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

Summary of changes:
 html/cgi-bin/samba.cgi |    4 ++--
 lfs/samba              |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 57970db..27856ca 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2005-2010  IPFire Team                                      =
  #
+# Copyright (C) 2005-2012  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -77,7 +77,7 @@ my %servicenames =3D ('SMB Daemon' =3D> 'smbd','NetBIOS Nam=
eserver' =3D> 'nmbd');
=20
 $sambasettings{'WORKGRP'} =3D 'homeip.net';
 $sambasettings{'NETBIOSNAME'} =3D 'IPFire';
-$sambasettings{'SRVSTRING'} =3D 'Samba running on IPFire 2.9';
+$sambasettings{'SRVSTRING'} =3D 'Samba running on IPFire 2.x';
 $sambasettings{'INTERFACES'} =3D '';
 $sambasettings{'SECURITY'} =3D 'share';
 $sambasettings{'OSLEVEL'} =3D '33';
diff --git a/lfs/samba b/lfs/samba
index 9708a9a..e27ee08 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2011  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2012  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 3.5.14
+VER        =3D 3.5.15
=20
 THISAPP    =3D samba-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D samba
-PAK_VER    =3D 39
+PAK_VER    =3D 40
=20
 DEPS       =3D "cups"
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D a97f5647face6e9214d5c42903412474
+$(DL_FILE)_MD5 =3D 2d72c044bdfd854ee2ab736326da3afd
=20
 install : $(TARGET)
=20


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

--===============4671070587462283580==--