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 2e5cba5c3f7f11019df1380237baddf1759557ea (commit) via a97f6dd36bb55b933e45e6563bb87b4f973bc604 (commit) via 54b07019a0ab741cd898c63717d157b8d097ec5c (commit) via be9b380a7fc8b902a5ecaaea1627ee67f4454147 (commit) via 7374af87763ac2beb4a0cfaf19c3bc2180b581d3 (commit) via 4439f0b9525ae7528d597e89a64f783eb2903826 (commit) via 784bac5f3cb75ee3c2baee42e2428ebd812fee08 (commit) from 52bc0ab96f2cb0b2fce4fd348f2b5102a33d9bf7 (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 2e5cba5c3f7f11019df1380237baddf1759557ea Merge: 52bc0ab a97f6dd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue May 17 23:39:58 2011 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/mpfire/mpd.conf | 1 - config/rootfiles/packages/cups | 3 +-- config/rootfiles/packages/libmpdclient | 3 ++- lfs/cups | 8 ++++---- lfs/libmpdclient | 8 ++++---- lfs/mpc | 8 ++++---- lfs/mpd | 17 ++++++++++------- lfs/mpfire | 4 ++-- lfs/rsync | 8 ++++---- src/paks/mpfire/install.sh | 6 ++++-- 10 files changed, 35 insertions(+), 31 deletions(-)
Difference in files: diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf index 10da064..d66481e 100644 --- a/config/mpfire/mpd.conf +++ b/config/mpfire/mpd.conf @@ -7,7 +7,6 @@ port "6600" music_directory "/var/mp3" playlist_directory "/var/ipfire/mpfire" log_file "/var/log/mpd.log" -error_file "/var/log/mpd.error.log" pid_file "/var/run/mpd.pid" ##########################################################
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index d83113c..6bf7e69 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -883,7 +883,6 @@ usr/share/doc/cups/help #usr/share/doc/cups/help/man-cupsenable.html #usr/share/doc/cups/help/man-cupstestdsc.html #usr/share/doc/cups/help/man-cupstestppd.html -#usr/share/doc/cups/help/man-drv.html #usr/share/doc/cups/help/man-filter.html #usr/share/doc/cups/help/man-lp.html #usr/share/doc/cups/help/man-lpadmin.html @@ -948,6 +947,7 @@ usr/share/doc/cups/images #usr/share/doc/cups/images/cups-postscript-chain.png #usr/share/doc/cups/images/cups-raster-chain.png #usr/share/doc/cups/images/cups.png +#usr/share/doc/cups/images/generic.png #usr/share/doc/cups/images/left.gif #usr/share/doc/cups/images/raster.png #usr/share/doc/cups/images/right.gif @@ -1012,7 +1012,6 @@ usr/share/doc/cups/robots.txt #usr/share/man/man5/printers.conf.5.gz #usr/share/man/man5/subscriptions.conf.5.gz #usr/share/man/man7/backend.7.gz -#usr/share/man/man7/drv.7.gz #usr/share/man/man7/filter.7.gz #usr/share/man/man7/notifier.7.gz #usr/share/man/man8/accept.8.gz diff --git a/config/rootfiles/packages/libmpdclient b/config/rootfiles/packages/libmpdclient index ac22426..df102d7 100644 --- a/config/rootfiles/packages/libmpdclient +++ b/config/rootfiles/packages/libmpdclient @@ -24,6 +24,7 @@ #usr/include/mpd/response.h #usr/include/mpd/search.h #usr/include/mpd/send.h +#usr/include/mpd/settings.h #usr/include/mpd/song.h #usr/include/mpd/stats.h #usr/include/mpd/status.h @@ -34,7 +35,7 @@ #usr/lib/libmpdclient.la usr/lib/libmpdclient.so usr/lib/libmpdclient.so.2 -usr/lib/libmpdclient.so.2.0.0 +usr/lib/libmpdclient.so.2.0.1 #usr/lib/pkgconfig/libmpdclient.pc #usr/share/doc/libmpdclient #usr/share/doc/libmpdclient/COPYING diff --git a/lfs/cups b/lfs/cups index e8d9cc0..e7fd085 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 @@
include Config
-VER = 1.4.4 +VER = 1.4.6
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 6 +PAK_VER = 7
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d +$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1
install : $(TARGET)
diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 1778beb..e2e8bde 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 @@
include Config
-VER = 2.1 +VER = 2.4
THISAPP = libmpdclient-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpdclient -PAK_VER = 1 +PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 67efa0c3d107c090ef277dfb3442d1e3 +$(DL_FILE)_MD5 = 8c166c5212dd95d538d3a35bb9ad4634
install : $(TARGET)
diff --git a/lfs/mpc b/lfs/mpc index 0cd871e..f3e4848 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 @@
include Config
-VER = 0.19 +VER = 0.20
THISAPP = mpc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpc -PAK_VER = 4 +PAK_VER = 5
DEPS = "mpd libmpdclient"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ab2967d9ec719b06a86f3b4121be654 +$(DL_FILE)_MD5 = 24c81ad6afe6099e8d7a6826ef4b7105
install : $(TARGET)
diff --git a/lfs/mpd b/lfs/mpd index e6d86ab..7cd616e 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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,15 +24,15 @@
include Config
-VER = 0.15.12 +VER = 0.16.2
THISAPP = mpd-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 11 +PAK_VER = 12
DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c +$(DL_FILE)_MD5 = a75ad715cc381dc5efeff6dbf313a954
install : $(TARGET)
@@ -76,8 +76,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-ipv6 \ + --sysconfdir=/etc \ + --disable-sqlite cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/mpfire b/lfs/mpfire index 5a8b85f..facb179 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -30,7 +30,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 10 +PAK_VER = 11
DEPS = "mpd mpc"
diff --git a/lfs/rsync b/lfs/rsync index a68e191..e151987 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@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 @@
include Config
-VER = 3.0.7 +VER = 3.0.8
THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 5 +PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b53525900817cf1ba7ad3a516ab5bfe9 +$(DL_FILE)_MD5 = 0ee8346ce16bdfe4c88a236e94c752b4
install : $(TARGET)
diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh index e09fca4..f8f833d 100644 --- a/src/paks/mpfire/install.sh +++ b/src/paks/mpfire/install.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2007-2011 IPFire-Team info@ipfire.org. # # # ############################################################################ # @@ -28,7 +28,9 @@ ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf chmod 755 /srv/web/ipfire/html/images/mpfire -touch /var/log/mpd.error.log touch /var/log/mpd.log restore_backup ${NAME} +# comment removed option from config +sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf +# /etc/init.d/mpd start
hooks/post-receive -- IPFire 2.x development tree