public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 391540d9d82b42042756c67b2f5676d799d92f59
Date: Wed, 07 Oct 2020 08:10:06 +0000	[thread overview]
Message-ID: <4C5n7f3PXQz2xbk@people01.haj.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 3155 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, next has been updated
       via  391540d9d82b42042756c67b2f5676d799d92f59 (commit)
       via  42c19f78d84a9472b3dffcf8c17a6b7ca4baaf34 (commit)
      from  ffd8eafa52ebf3cc478adf19bd3553edfad97289 (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 391540d9d82b42042756c67b2f5676d799d92f59
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 7 08:09:36 2020 +0000

    samba: Link against avahi
    
    We should use avahi to announce file sharing services to
    the network using mDNS, too.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 42c19f78d84a9472b3dffcf8c17a6b7ca4baaf34
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 7 08:04:38 2020 +0000

    avahi: Disable custom stack protector configuration
    
    We already pass -fstack-protector-strong, which might be overridden
    by -fstack-protector-all. We also know that SSP works in our version
    of libc and do not need to link against libssp.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 lfs/avahi | 3 ++-
 lfs/samba | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/lfs/avahi b/lfs/avahi
index 6807a080d..2ed13dd44 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = dbus libdaemon
 
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-avahi-user=avahi \
+		--disable-stack-protector \
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-qt5 \
diff --git a/lfs/samba b/lfs/samba
index dcc3ee051..874166d2e 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 69
+PAK_VER    = 70
 
-DEPS       = cups libtirpc krb5 perl-Parse-Yapp
+DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
 
 ###############################################################################
 # Top-level Rules
@@ -90,9 +90,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-acl-support \
 		--with-sendfile-support \
 		--with-winbind \
-		--enable-fhs \
+		--enable-avahi \
 		--enable-cups \
-		--disable-avahi \
+		--enable-fhs \
 		--with-syslog
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install


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

                 reply	other threads:[~2020-10-07  8:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C5n7f3PXQz2xbk@people01.haj.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox