Accepting request 19343 from multimedia:libs

Copy from multimedia:libs/alsa based on submit request 19343 from user tiwai OBS-URL: https://build.opensuse.org/request/show/19343 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=77
2009-09-02 16:23:10 +00:00 · 2009-09-02 16:23:10 +00:00 · 233e77630f
commit 233e77630f
parent c231514fe0 48dc8c6320
7 changed files with 46 additions and 4805 deletions
--- a/alsa-info.sh
+++ b/alsa-info.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-SCRIPT_VERSION=0.4.57
+SCRIPT_VERSION=0.4.58
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"

 #################################################################################
@ -46,7 +46,7 @@ pbcheck(){
 }

 update() {
-	SHFILE=`mktemp -p /tmp alsa-info.XXXXXXXXXX`
+	SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
 	wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
 	REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
@ -74,8 +74,7 @@ update() {
 					echo "Please re-run the script"
 					rm $SHFILE 2>/dev/null
 				else
-					mv -f $SHFILE /tmp/alsa-info.sh || exit 1
-					echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+					echo "ALSA-Info script has been downloaded as $SHFILE."
 					echo "Please re-run the script from new location."
 				fi
 				exit
@ -92,8 +91,7 @@ update() {
 				echo "ALSA-Info script has been updated. Please re-run it."
 				rm $SHFILE 2>/dev/null
 			else
-				mv -f $SHFILE /tmp/alsa-info.sh || exit 1
-				echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh."
+				echo "ALSA-Info script has been downloaded $SHFILE."
 				echo "Please, re-run it from new location."
 			fi
 			exit
@ -105,8 +103,9 @@ update() {

 cleanup() {
 	if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
-		rm -r "$TEMPDIR" 2>/dev/null
+		rm -rf "$TEMPDIR" 2>/dev/null
 	fi
+	test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
 }


@ -309,6 +308,9 @@ SYSFS=$(mount |grep sysfs|awk {'print $3'});
 #Check modprobe config files for sound related options
 SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')

+KEEP_OUTPUT=
+NFILE=""
+
 PASTEBIN=""
 WWWSERVICE="www.alsa-project.org"
 WELCOME="yes"
@ -380,9 +382,11 @@ fi # dialog
 fi # WELCOME

 #Set the output file
-TEMPDIR=`mktemp -p /tmp -d alsa-info.XXXXXXXXXX`
+TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
 FILE="$TEMPDIR/alsa-info.txt"
-NFILE="/tmp/alsa-info.txt"
+if [ -z "$NFILE" ]; then
+	NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
+fi

 trap cleanup 0

@ -394,9 +398,6 @@ then
 	exit 0
 fi

-#Create the temporary work dir.
-mkdir $TEMPDIR 2>/dev/null
-
 #Fetch the info and store in temp files/variables
 DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
 KERNEL_VERSION=`uname -r`
@ -629,6 +630,11 @@ then
 			UPLOAD="no"
 			withall
 			;;
+		--output)
+			shift
+			NFILE="$1"
+			KEEP_OUTPUT="yes"
+			;;
 		--debug)
 			echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
 			KEEP_FILES="yes"
@ -710,13 +716,14 @@ then
 			echo "	--with-devices (shows the device nodes in /dev/snd/)"
 			echo "	--with-dmesg (shows the ALSA/HDA kernel messages)"
 			echo ""
+			echo "	--output FILE (specify the file to output for no-upload mode)"
 			echo "	--update (check server for script updates)"
 			echo "	--upload (upload contents to remote server)"
 			echo "	--no-upload (do not upload contents to remote server)"
 			echo "	--pastebin (use http://pastebin.ca) as remote server"
 			echo "	    instead www.alsa-project.org"
-			echo "  --stdout (print alsa information to standard output"
-			echo "      instead of a file)"
+			echo "	--stdout (print alsa information to standard output"
+			echo "	    instead of a file)"
 			echo "	--about (show some information about the script)"
 			echo "	--debug (will run the script as normal, but will not"
 			echo "	     delete $FILE)"
@ -756,6 +763,7 @@ if [ "$UPLOAD" = "no" ]; then

 	if [ -z "$TOSTDOUT" ]; then
 		mv -f $FILE $NFILE || exit 1
+		KEEP_OUTPUT="yes"
 	fi

 	if [[ -n $DIALOG ]]
@ -869,6 +877,7 @@ echo ""
 #We couldnt find a suitable wget, so tell the user to upload manually.
 else
 	mv -f $FILE $NFILE || exit 1
+	KEEP_OUTPUT="yes"
 	if [[ -z $DIALOG ]]
 	then
 		if [[ -z $PASTEBIN ]]; then
--- a/alsa-lib-1.0.20.tar.bz2
+++ b/alsa-lib-1.0.20.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
-size 794728
--- a/alsa-lib-1.0.21.tar.bz2
+++ b/alsa-lib-1.0.21.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab6c40e4f694284d249841075458bbef77ffa0d06561fd847548c28082a79925
+size 808252
--- a/alsa-lib-git-fixes.diff
+++ b/alsa-lib-git-fixes.diff
--- a/alsa.changes
+++ b/alsa.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 31 16:21:19 CEST 2009 - tiwai@suse.de
+
+- updated to version 1.0.21:
+  just a version bump including previous fixes
+
+-------------------------------------------------------------------
+Wed Aug 26 10:30:12 CEST 2009 - tiwai@suse.de
+
+- fix alsa-info.sh possible symlink attach (bnc#533396,
+  CVE-2009-0035)
+- add -q to killall in alsasound init script to be more quiet
+
 -------------------------------------------------------------------
 Fri Aug 21 01:26:21 CEST 2009 - tiwai@suse.de

--- a/alsa.spec
+++ b/alsa.spec
@ -1,5 +1,5 @@
 #
-# spec file for package alsa (Version 1.0.20)
+# spec file for package alsa (Version 1.0.21)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -20,7 +20,7 @@

 Name:           alsa
 BuildRequires:  doxygen
-%define package_version	1.0.20
+%define package_version	1.0.21
 License:        GPL v2 or later
 Group:          System/Libraries
 Requires:       alsa-utils
@ -33,8 +33,8 @@ Obsoletes:      alsa-64bit
 %endif
 #
 Summary:        Advanced Linux Sound Architecture
-Version:        1.0.20
-Release:        10
+Version:        1.0.21
+Release:        1
 Source:         ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
 Source8:        40-alsa.rules
 Source11:       alsasound
@ -50,7 +50,7 @@ Source31:       all_notes_off.bin
 Source32:       all_notes_off.mid
 Source33:       alsa-info.sh
 Source34:       alsa-init.sh
-Patch:          alsa-lib-git-fixes.diff
+# Patch:          alsa-lib-git-fixes.diff
 Url:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@ -122,7 +122,7 @@ Authors:

 %prep
 %setup -q -n alsa-lib-%{package_version}
-%patch -p1
+# %patch -p1
 # hack to fix build on older distros
 %if %suse_version < 1100
 %ifarch %ix86
--- a/2
+++ b/2
@ -203,7 +203,7 @@ case "$1" in
 	    if [ -d /proc/asound ]; then
 		$alsactl -f $asoundcfg store
 		# kill pulseaudio before muting the system (bnc#499445)
-		if killall -TERM pulseaudio; then
+		if killall -q -TERM pulseaudio; then
 		    usleep 200
 		fi
 		mute_system