This commit was manufactured by cvs2git to create tag 'AC-STABLE'.

Sprout from AC-branch 2008-02-11 22:11:50 UTC cvs2git <feedback@pld-linux.org> 'This commit was manufactured by cvs2git to create branch 'AC-branch'.'
Cherrypick from AC-branch 2007-01-28 22:12:56 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 1':
    arts.spec -> 1.129.2.9
Cherrypick from master 2006-08-18 11:22:16 UTC Artur Frysiak <artur@frysiak.net> '- allow autoconf 2.60':
    kde-ac260.patch -> 1.1
Delete:
    arts-branch.diff
    arts-extension_loader.patch

diff --git a/arts-branch.diff b/arts-branch.diff
deleted file mode 100644 (file)
index 7b11907..0000000
--- a/arts-branch.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: arts/soundserver/artswrapper.c
-===================================================================
---- arts/soundserver/artswrapper.c     (.../tags/arts/1.5.3)   (revision 549703)
-+++ arts/soundserver/artswrapper.c     (.../branches/arts/1.5) (revision 549703)
-@@ -95,6 +95,10 @@
- #else
-               setreuid(-1, getuid());
- #endif
-+              if (geteuid() != getuid()) {
-+                      perror("setuid()");
-+                      return 2;
-+              }
-       }
- 
-       if(argc == 0)
-Index: arts/soundserver/crashhandler.cc
-===================================================================
---- arts/soundserver/crashhandler.cc   (.../tags/arts/1.5.3)   (revision 549703)
-+++ arts/soundserver/crashhandler.cc   (.../branches/arts/1.5) (revision 549703)
-@@ -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: arts/flow/gsl/gslmagic.c
-===================================================================
---- arts/flow/gsl/gslmagic.c   (.../tags/arts/1.5.3)   (revision 549703)
-+++ arts/flow/gsl/gslmagic.c   (.../branches/arts/1.5) (revision 549703)
-@@ -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)
-     {
-
-Property changes on: arts
-___________________________________________________________________
-Name: svn:externals
-   + libltdl https://svn.kde.org/home/kde/branches/KDE/3.5/kdelibs/libltdl
-admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
-
-

diff --git a/arts-extension_loader.patch b/arts-extension_loader.patch
deleted file mode 100644 (file)
index 3824573..0000000
--- a/arts-extension_loader.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- arts-1.5.5/mcop/Makefile.am.orig   2005-09-10 10:13:32.000000000 +0200
-+++ arts-1.5.5/mcop/Makefile.am        2007-01-05 21:47:58.212920750 +0100
-@@ -16,7 +16,9 @@
-        trader_impl.cc dynamicrequest.cc anyref.cc loopback.cc \
-        delayedreturn.cc thread.cc dynamicskeleton.cc
- 
-+CXXFLAGS += -fexceptions
- libmcop_la_LIBADD = $(LIBSOCKET) $(GLIB_LIBADD) $(top_builddir)/libltdl/libltdlc.la
-+libmcop_la_LIBADD += -lboost_filesystem -lboost_regex
- libmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
- 
- artsincludedir = $(includedir)/arts
---- arts-1.5.5/mcop/extensionloader.cc.orig    2005-09-10 10:13:32.000000000 +0200
-+++ arts-1.5.5/mcop/extensionloader.cc 2007-01-05 22:36:03.034272500 +0100
-@@ -28,26 +28,58 @@
- #include <unistd.h>
- #include <assert.h>
- 
-+#include <boost/filesystem/exception.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/regex.hpp>
-+
- using namespace std;
- using namespace Arts;
- 
-+static std::string makeLibraryName( std::string const& dir, std::string const& name )
-+{
-+      try
-+      {
-+              std::string p = dir + "/" + name;
-+              if ( boost::filesystem::exists( p + ".so" ) )
-+                      return ( p + ".so" );
-+              boost::regex re( p + "(-.+){0,1}\\..+", boost::regex::extended );
-+              for ( boost::filesystem::directory_iterator i( dir );
-+                      i != boost::filesystem::directory_iterator(); ++i )
-+              {
-+                      boost::smatch m;
-+                      if ( boost::regex_match( i->string(), m, re ) )
-+                              return m.str();
-+              }
-+              return ( p + ".la" );
-+      }
-+      catch ( boost::filesystem::filesystem_error const& )
-+      {
-+      }
-+      return std::string();
-+}
-+
- ExtensionLoader::ExtensionLoader(const string& filename) :handle(0)
- {
-       string dlfilename;
--
-       assert(filename.size());
--      if(filename[0] == '/')
--              dlfilename = filename;
--      else
-+      try
-+      {
-+              boost::filesystem::path p( filename );
-+              if ( p.has_root_directory() )
-+                      dlfilename = makeLibraryName( p.branch_path().string(), p.leaf() );
-+      }
-+      catch ( boost::filesystem::filesystem_error const& )
-+      {
-+      }
-+      if ( dlfilename.empty() )
-       {
-               const vector<string> *path = MCOPUtils::extensionPath();
- 
-               vector<string>::const_iterator pi;
-               for(pi = path->begin(); pi != path->end(); pi++)
-               {
--                      dlfilename = *pi + "/" + filename;
--
--                      if(access(dlfilename.c_str(),F_OK) == 0)
-+                      dlfilename = makeLibraryName( *pi, filename );
-+                      if ( !dlfilename.empty() && ( access( dlfilename.c_str(), F_OK ) == 0 ) )
-                               break;
-               }
-       }

diff --git a/arts.spec b/arts.spec
index 179f662c6a4d50dbfd62c93b23bb1d168f75fc58..0f2c132e27fac7892e5b51c7a03993b95fc31967 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -6,19 +6,19 @@
 %bcond_with    hidden_visibility       # pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
 #
 %define                _state          stable
-%define                _kdever         3.5.8
+%define                _kdever         3.5.6
 #
 Summary:       aRts sound server
 Summary(pl):   Serwer d¼wiêku
 Summary(pt_BR):        Servidor de sons usado pelo KDE
 Name:          arts
-Version:       1.5.8
+Version:       1.5.6
 Release:       1
 Epoch:         13
 License:       LGPL
 Group:         Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 061ce49351d970a81f4c0a1b0339fb34
+# Source0-md5: e986393a5827499bbad04a00b797add0
 #Patch100:     %{name}-branch.diff
 Patch0:                %{name}-libs.patch
 Patch1:                kde-ac260-lt.patch