public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core111, updated. feadf6285e933b76d15769c6cd13f5dbff8029bf
Date: Tue, 30 May 2017 20:44:44 +0100	[thread overview]
Message-ID: <20170530194445.1997710853C3@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 3433 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, core111 has been updated
       via  feadf6285e933b76d15769c6cd13f5dbff8029bf (commit)
       via  203601bf686a3248f4a807d728ed53bc7c499e0d (commit)
       via  5ba5f8c02bda20d9de226eecb5bb73654c23173a (commit)
       via  9598998f686a75079519fdcce5553529700418e6 (commit)
       via  e3922c1b5665d3e8c004e4b455525644c035989c (commit)
       via  5b62ae49d8188a0f28fc1df8e80dcb35c29771ac (commit)
      from  82d25bae628797aa3af43c077b29b30fa91d6b30 (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 feadf6285e933b76d15769c6cd13f5dbff8029bf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue May 30 21:29:53 2017 +0200

    samba: bump package version
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 203601bf686a3248f4a807d728ed53bc7c499e0d
Merge: 82d25ba 5ba5f8c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue May 30 21:29:20 2017 +0200

    Merge branch 'core110'

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

Summary of changes:
 config/rootfiles/core/110/update.sh | 8 ++++++++
 lfs/cups-filters                    | 2 +-
 lfs/mpd                             | 2 +-
 lfs/samba                           | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
index 2011d4d..ada4fc5 100644
--- a/config/rootfiles/core/110/update.sh
+++ b/config/rootfiles/core/110/update.sh
@@ -47,6 +47,14 @@ ldconfig
 # Remove deprecated options
 sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
 
+# Remove avahi from system and pakfire db
+for i in $(cat /opt/pakfire/db/rootfiles/avahi); do
+    rm -rfv /${i}
+done
+rm -fv /opt/pakfire/db/rootfiles/avahi
+rm -fv /opt/pakfire/db/*/meta-avahi
+rm -fv /etc/rc.d/rc*.d/???avahi
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart
diff --git a/lfs/cups-filters b/lfs/cups-filters
index d46bc7c..109db07 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups-filters
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "cups ghostscript"
 
diff --git a/lfs/mpd b/lfs/mpd
index 6b057f7..93039b7 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis opus"
 
diff --git a/lfs/samba b/lfs/samba
index b29db02..815a8ec 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 65
+PAK_VER    = 66
 
 DEPS       = "cups krb5"
 


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

                 reply	other threads:[~2017-05-30 19:44 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=20170530194445.1997710853C3@git01.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