public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 36600cef36577ca36d4349bc7658a68234311ea2
@ 2018-03-30  7:36 git
  0 siblings, 0 replies; only message in thread
From: git @ 2018-03-30  7:36 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 3242 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  36600cef36577ca36d4349bc7658a68234311ea2 (commit)
       via  7eb86ee39ec799e7a3ef614e96263e50f708f85d (commit)
       via  f0869181e846cf235eca2d74eaf4c219740f3de8 (commit)
       via  4038a839612438a43e3771a1f534218890a64dc4 (commit)
       via  c560b903a9ef9efb7d93a503da4667adbec94ccc (commit)
       via  2edff5e9700908a3c91a8f0a66862f420faefebd (commit)
       via  6af8fa9e0f9850a17efffecd8e42da28e7178edf (commit)
       via  00ac9578ef7d09a6bb2ef247d2ee428fcc11239f (commit)
       via  eca0e5dc820f3c53d8f2a6c0128dcd5af13c06e6 (commit)
       via  2e25aed0fdb38d5fde21e9c28c40e16fd20b1900 (commit)
       via  c2bebebc0e965fe024958a37ff25281183449a5f (commit)
       via  727ac931479d2c67f50692d5ac3807b1bf9d5dee (commit)
       via  9d5d057dac6d67be939bebc1d3adf39b170a18d7 (commit)
       via  d895399850ed6507fb550e80084732d1d7a8fde8 (commit)
      from  6a8b2ef9772b58406f9e9b073e68dcf71eabb327 (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 36600cef36577ca36d4349bc7658a68234311ea2
Merge: 6a8b2ef97 7eb86ee39
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Mar 30 09:35:28 2018 +0200

    Merge branch 'core119' into next

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

Summary of changes:
 config/rootfiles/oldcore/119/filelists/files | 1 +
 config/rootfiles/oldcore/119/update.sh       | 3 +++
 lfs/mpd                                      | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/119/filelists/files b/config/rootfiles/oldcore/119/filelists/files
index a89e1b33e..c6d38e2ae 100644
--- a/config/rootfiles/oldcore/119/filelists/files
+++ b/config/rootfiles/oldcore/119/filelists/files
@@ -7,5 +7,6 @@ srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/libgcc_s.so.1
 var/ipfire/backup/include
 var/ipfire/langs
diff --git a/config/rootfiles/oldcore/119/update.sh b/config/rootfiles/oldcore/119/update.sh
index ed23e1f58..8ada47455 100644
--- a/config/rootfiles/oldcore/119/update.sh
+++ b/config/rootfiles/oldcore/119/update.sh
@@ -54,6 +54,9 @@ extract_files
 # update linker config
 ldconfig
 
+# restart init
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
diff --git a/lfs/mpd b/lfs/mpd
index 2beb422fa..0e57a2846 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    = 17
+PAK_VER    = 18
 
 DEPS       = "alsa faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus"
 


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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-03-30  7:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-30  7:36 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 36600cef36577ca36d4349bc7658a68234311ea2 git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox