rpms/arts/devel arts-1.5.3-1.5.4.patch, NONE, 1.1 arts.spec, 1.62, 1.63
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 24 11:55:12 UTC 2006
Author: than
Update of /cvs/dist/rpms/arts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29736
Modified Files:
arts.spec
Added Files:
arts-1.5.3-1.5.4.patch
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)
arts-1.5.3-1.5.4.patch:
admin/acinclude.m4.in | 2 +-
admin/cvs.sh | 6 +++---
arts.lsm | 4 ++--
configure.in.in | 2 +-
flow/gsl/gslmagic.c | 2 +-
soundserver/artswrapper.c | 4 ++++
soundserver/crashhandler.cc | 7 ++++++-
7 files changed, 18 insertions(+), 9 deletions(-)
--- NEW FILE arts-1.5.3-1.5.4.patch ---
Index: soundserver/artswrapper.c
===================================================================
--- soundserver/artswrapper.c (.../1.5.3/arts) (Revision 565763)
+++ soundserver/artswrapper.c (.../1.5.4/arts) (Revision 565763)
@@ -95,6 +95,10 @@
#else
setreuid(-1, getuid());
#endif
+ if (geteuid() != getuid()) {
+ perror("setuid()");
+ return 2;
+ }
}
if(argc == 0)
Index: soundserver/crashhandler.cc
===================================================================
--- soundserver/crashhandler.cc (.../1.5.3/arts) (Revision 565763)
+++ soundserver/crashhandler.cc (.../1.5.4/arts) (Revision 565763)
@@ -196,7 +196,12 @@
argv[i++] = NULL;
setgid(getgid());
- setuid(getuid());
+ if (getuid() != geteuid())
+ setuid(getuid());
+ if (getuid() != geteuid()) {
+ perror("setuid()");
+ exit(255);
+ }
execvp(crashApp, argv);
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh (.../1.5.3/arts) (Revision 565763)
+++ admin/cvs.sh (.../1.5.4/arts) (Revision 565763)
@@ -32,7 +32,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" )
echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" )
echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.3\""
+ VERSION="\"3.5.4\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in (.../1.5.3/arts) (Revision 565763)
+++ admin/acinclude.m4.in (.../1.5.4/arts) (Revision 565763)
@@ -2747,7 +2747,7 @@
EXRSTATUS=old
else
kde_save_LIBS="$LIBS"
- LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+ LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS"
Index: configure.in.in
===================================================================
--- configure.in.in (.../1.5.3/arts) (Revision 565763)
+++ configure.in.in (.../1.5.4/arts) (Revision 565763)
@@ -17,7 +17,7 @@
dnl Version (we /might/ want to use libtool versioning, too)
ARTS_MAJOR_VERSION=1
ARTS_MINOR_VERSION=5
-ARTS_MICRO_VERSION=3
+ARTS_MICRO_VERSION=4
ARTS_VERSION=$ARTS_MAJOR_VERSION.$ARTS_MINOR_VERSION.$ARTS_MICRO_VERSION
dnl Automake doc recommends to do this only here. (Janos)
Index: arts.lsm
===================================================================
--- arts.lsm (.../1.5.3/arts) (Revision 565763)
+++ arts.lsm (.../1.5.4/arts) (Revision 565763)
@@ -1,7 +1,7 @@
Begin4
Title: arts
-Version: 1.5.3
-Entered-date: 2006-05-23
+Version: 1.5.4
+Entered-date: 2006-08-02
Description: Soundserver for the K Desktop Environment (KDE)
Keywords: KDE X11 desktop Qt
Author: http://bugs.kde.org/ (KDE Bugtracking System)
Index: flow/gsl/gslmagic.c
===================================================================
--- flow/gsl/gslmagic.c (.../1.5.3/arts) (Revision 565763)
+++ flow/gsl/gslmagic.c (.../1.5.4/arts) (Revision 565763)
@@ -616,7 +616,7 @@
return FALSE;
do
- ret = fstat (bfile->fd, &buf) < 0;
+ ret = fstat (bfile->fd, &buf);
while (ret < 0 && errno == EINTR);
if (ret < 0)
{
Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- arts.spec 18 Jul 2006 08:10:58 -0000 1.62
+++ arts.spec 24 Jul 2006 11:55:10 -0000 1.63
@@ -3,14 +3,12 @@
%define debug 0
%define final 0
-%define alsa 1
%define qt_version 3.3.6
%define make_cvs 1
-%define disable_gcc_check_and_hidden_visibility 1
-Version: 1.5.3
-Release: 2
+Version: 1.5.4
+Release: 0.pre1
Summary: aRts (analog realtime synthesizer) - the KDE sound system
Name: arts
Group: System Environment/Daemons
@@ -18,10 +16,10 @@
Epoch: 8
Url: http://www.kde.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-1.5.3.tar.bz2
Source1: gslconfig-wrapper.h
-Patch0: kde-libtool.patch
+Patch0: arts-1.5.3-1.5.4.patch
Patch1: arts-1.1.4-debug.patch
Patch2: arts-1.3.92-glib2.patch
Patch5: arts-1.3.1-alsa.patch
@@ -34,11 +32,10 @@
Obsoletes: kdelibs-sound
Provides: kdelibs-sound
-%if %{alsa}
BuildRequires: alsa-lib-devel >= 1.0.2
-%endif
BuildRequires: autoconf >= 2.53
BuildRequires: automake
+BuildRequires: libtool
BuildRequires: qt-devel >= 1:%{qt_version}
BuildRequires: perl
BuildRequires: glib2-devel
@@ -67,9 +64,7 @@
Requires: glib2-devel
Requires: libvorbis-devel
Requires: audiofile-devel
-%if %{alsa}
Requires: alsa-lib-devel
-%endif
Obsoletes: kdelibs-sound-devel
Provides: kdelibs-sound-devel
@@ -89,8 +84,8 @@
KDE applications using sound).
%prep
-%setup -q
-%patch0 -p1 -b .libtool
+%setup -q -n %{name}-1.5.3
+%patch0 -p0 -b .libtool
%patch1 -p1 -b .debug
%patch2 -p1 -b .glib
%patch5 -p1 -b .alsa
@@ -100,10 +95,6 @@
%build
unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export PATH=`pwd`:$PATH
%if %{make_cvs}
make -f admin/Makefile.common cvs
@@ -112,12 +103,8 @@
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
--disable-gcc-hidden-visibility \
-%endif
-%if %{alsa}
--with-alsa \
-%endif
%if %{final}
--enable-final \
%endif
@@ -175,6 +162,9 @@
%{_libdir}/pkgconfig/artsc.pc
%changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 8:1.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
* Tue Jul 18 2006 Than Ngo <than at redhat.com> 8:1.5.3-2
- rebuild
More information about the fedora-cvs-commits
mailing list