--- cmus-2.2.0.orig/ffmpeg.c +++ cmus-2.2.0/ffmpeg.c @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "ip.h" #include "xmalloc.h" --- cmus-2.2.0.orig/cmus-status-display +++ cmus-2.2.0/cmus-status-display @@ -19,7 +19,7 @@ output() { # write status to /tmp/cmus-status (not very useful though) - echo "$*" >> /tmp/cmus-status 2>&1 + echo "$*" >> ~/.cmus-status 2>&1 # WMI (http://wmi.modprobe.de/) #wmiremote -t "$*" &> /dev/null --- cmus-2.2.0.orig/debian/manpages +++ cmus-2.2.0/debian/manpages @@ -0,0 +1,2 @@ +Doc/cmus.1 +Doc/cmus-remote.1 --- cmus-2.2.0.orig/debian/watch +++ cmus-2.2.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://onion.dynserv.net/~timo/files/cmus-(.*)\.tar\.bz2 --- cmus-2.2.0.orig/debian/changelog +++ cmus-2.2.0/debian/changelog @@ -0,0 +1,107 @@ +cmus (2.2.0-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #312215), Ubuntu remaining changes: + - ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg + snapshots (LP: #311007). + + -- Alessio Treglia Mon, 29 Dec 2008 17:36:47 +0100 + +cmus (2.2.0-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Modify example script cmus-status-display to write the current + status to .cmus-status in the user's home instead of /tmp/cmus-status, + since the latter could lead to symlink attacks. CVE-2008-5375 + (Closes: #509277) + + -- Moritz Muehlenhoff Sun, 28 Dec 2008 14:57:06 +0100 + +cmus (2.2.0-1ubuntu1) jaunty; urgency=low + + * ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg + snapshots (LP: #311007). + + -- Lionel Le Folgoc Fri, 26 Dec 2008 13:08:26 +0100 + +cmus (2.2.0-1build2) jaunty; urgency=low + + * Rebuild to pickup ffmpeg's new shlibs (LP: #289600). + + -- Lionel Le Folgoc Thu, 06 Nov 2008 22:16:39 +0100 + +cmus (2.2.0-1build1) intrepid; urgency=low + + * Rebuild for ffmpeg -> ffmpeg-free transition (LP: #245576). + + -- Michael Bienia Tue, 08 Jul 2008 16:02:28 +0200 + +cmus (2.2.0-1) unstable; urgency=low + + * New upstream release + * Add libwavpack-dev and libavformat.dev to Build-Depends + * Update debian/copyright + + -- Julien Louis Fri, 27 Jul 2007 21:54:36 +0200 + +cmus (2.1.0-2) unstable; urgency=low + + * Rebuild against libflac8 (Closes: #426638). + + -- Julien Louis Mon, 04 Jun 2007 22:56:58 +0200 + +cmus (2.1.0-1) unstable; urgency=low + + * New upstream release (closes: #399965). + * Updated debian/copyright + * Added libfaad-dev to Build-Depends + + -- Julien Louis Thu, 21 Dec 2006 20:25:59 +0100 + +cmus (2.0.4-1) unstable; urgency=low + + * New upstream release. + * Added debian/watch file. + * Build-Depends agains libasound2-dev (>= 1.0.11). + + -- Julien Louis Wed, 23 Aug 2006 03:34:04 +0200 + +cmus (2.0.3-3) unstable; urgency=low + + * Drop libasound2-dev Build Dependency on non-linux arches + (Closes: #377885). + + -- Julien Louis Wed, 12 Jul 2006 01:06:02 +0200 + +cmus (2.0.3-2) unstable; urgency=low + + * Move all dh_* helper stuff in the binary-arch target (Closes: #376320). + * Remove debian/patches/01_asciidoc_xsl_path.dpatch since it is not usefull. + * Remove dpatch from Build-Depends. + + -- Julien Louis Sun, 2 Jul 2006 14:16:03 +0200 + +cmus (2.0.3-1) unstable; urgency=low + + * New upstream release. + * Remove asciidoc, docbook-xsl, doxbook-xml ans xsltproc from Build-Depends. + * Add libartsc0-dev and libao-dev to Build-Depends. + + -- Julien Louis Sun, 18 Jun 2006 17:26:44 +0200 + +cmus (2.0.2-1) unstable; urgency=low + + * New upstream release. + * Remove ASCIIDOC patch since upstream now search for + /etc/asciidoc/docbook-xsl/. + * Add docbook-xml to Build-Depends. + * Bump Standards-Version no change needed. + * Added REAMDE.Debian + + -- Julien Louis Tue, 30 May 2006 22:12:01 +0200 + +cmus (2.0.0-1) unstable; urgency=low + + * Initial release (Closes: #340000) + + -- Julien Louis Mon, 7 Nov 2005 18:19:55 +0100 + --- cmus-2.2.0.orig/debian/examples +++ cmus-2.2.0/debian/examples @@ -0,0 +1 @@ +cmus-status-display --- cmus-2.2.0.orig/debian/copyright +++ cmus-2.2.0/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Julien Louis on +Mon, 7 Nov 2005 18:19:55 +0100. + +It was downloaded from http://onion.dynserv.net/~timo/index.php?page=Projects/cmus + +Copyright Holder: +2004-2006 Timo Hirvonen + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +Other copyright holders: + - Copyright 2006 Johannes Weißl for ao.c + - Copyright 2006 Chun-Yu Shei for mpc.c + - Copyright 2006 dnk for aac.c, mp4.c and waveout.c + - Copyright (C) 1999 Paul N. Fisher + 2002 Andy Lo A Foe for mikmod.c + - Copyright 2007 Kevin Ko for ffmpeg.c + - Copyright 2007 Johannes Weißl for most wavpack.c parts + - (C) 2006 by Peter Lemenkov for a small part of + wavpack.c --- cmus-2.2.0.orig/debian/docs +++ cmus-2.2.0/debian/docs @@ -0,0 +1,2 @@ +README +contrib/ --- cmus-2.2.0.orig/debian/compat +++ cmus-2.2.0/debian/compat @@ -0,0 +1 @@ +5 --- cmus-2.2.0.orig/debian/rules +++ cmus-2.2.0/debian/rules @@ -0,0 +1,89 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (, $(findstring nostrip, $(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure-stamp: + dh_testdir + # Add here commands to configure the package. + LDFLAGS="-Wl,--as-needed" CFLAGS="-I/usr/include/ncursesw" ./configure prefix=/usr DEBUG=0 + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f config.mk ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/cmus. + $(MAKE) install DESTDIR=$(CURDIR)/debian/cmus +# rm -rf $(CURDIR)/debian/cmus/usr/share + + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installchangelogs + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- cmus-2.2.0.orig/debian/control +++ cmus-2.2.0/debian/control @@ -0,0 +1,28 @@ +Source: cmus +Section: sound +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Julien Louis +Build-Depends: debhelper (>= 5.0.0), libflac-dev, libncursesw5-dev, + libmodplug-dev, libmad0-dev, libvorbis-dev, libasound2-dev (>= 1.0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libmpcdec-dev, libartsc0-dev, libao-dev, libfaad-dev, libwavpack-dev, libavformat-dev +Standards-Version: 3.7.2 + +Package: cmus +Architecture: any +Depends: ${shlibs:Depends} +Description: Lightweight ncurses audio player + C* Music Player is a modular and very configurable ncurses-based audio player. + It has some interesting features like configurable colorscheme, mp3 and ogg + streaming, it can be controlled with an UNIX socket, filters, album/artists + sorting and a vi-like configuration interface. + . + It currently supports different input formats: + - Ogg Vorbis + - MP3 (with libmad) + - FLAC + - Wav + - Modules (with libmodplug) + - Musepack + - AAC + - Windows Media Audio