From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 82d25bae628797aa3af43c077b29b30fa91d6b30
Date: Tue, 30 May 2017 20:11:17 +0100
Message-ID: <20170530191118.A099A10853C3@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1774607900738815851=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============1774607900738815851==
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  82d25bae628797aa3af43c077b29b30fa91d6b30 (commit)
       via  3b3fa6775b2d04f1ff4d083a160674980f3c2035 (commit)
      from  1ea4ab1783b4484d903f9819d122cfaf9f3b4659 (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 82d25bae628797aa3af43c077b29b30fa91d6b30
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Mon May 29 20:27:25 2017 +0200

    samba 3.6.25: fixes for lfs-file
   =20
    Removed 'unrecognized' configure-options.
   =20
    Deleted empty tab at line end and moved line '-mkdir -p /var/ipfire/samba'
    because of error message:
    'mkdir: cannot create directory =E2=80=98/var/ipfire/samba=E2=80=99: File=
 exists'
   =20
    Best,
    Matthias
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3b3fa6775b2d04f1ff4d083a160674980f3c2035
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu May 25 20:16:13 2017 +0100

    flash-image: Increase size of root partition
   =20
    This should still be small enough to barely fit on a disk that
    can hold 1GB of data. The actual one. Not the one that some
    vendors put on it.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 lfs/flash-images | 4 ++--
 lfs/samba        | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/lfs/flash-images b/lfs/flash-images
index 4a1a4d6..0754796 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -75,9 +75,9 @@ else
 endif
=20
 # /boot:  64MB - OFFSET
-# /    : 750MB
+# /    : 850MB
 S_BOOT :=3D $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT :=3D 1536000
+S_ROOT :=3D 1740800
=20
 PADDING =3D 100 # MB
=20
diff --git a/lfs/samba b/lfs/samba
index 8f0b946..b29db02 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
=20
 md5 : $(subst %,%_MD5,$(objects))
=20
-dist:=20
+dist:
 	@$(PAK)
=20
 ############################################################################=
###
@@ -170,10 +170,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-libsmbclient \
 		--with-libsmbsharemodes \
 		--with-sendfile-support \
-		--without-smbwrapper \
-		--with-mmap \
 		--with-fhs \
-		--with-vfs \
 		--with-winbind \
 		--disable-swat \
 		--enable-cups \
@@ -187,8 +184,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
 	#cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.s=
o.2
 	#cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+	-mkdir -p /var/ipfire/samba
 	cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var=
/ipfire/samba
-	-mkdir -p /var/ipfire/samba=09
 	cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
 	chown nobody:nobody -R /var/ipfire/samba/
 	cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global


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

--===============1774607900738815851==--