[mediatomb] Git master, re-bundle libupnp.

[Jon Ciesla]

commit 116a6590d8db88891d409842460e8f2ef9f55bf0
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Apr 3 13:29:58 2013 -0500

    Git master, re-bundle libupnp.

 .gitignore     |    1 +
 mediatomb.spec |   44 +++++++++++++++++++++++++-------------------
 sources        |    2 +-
 3 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c4b0ce..42a598a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mediatomb-0.12.1.tar.gz
+/mediatomb-b66dc1.tar.bz2
diff --git a/mediatomb.spec b/mediatomb.spec
index 2f3c5a7..992ff41 100644
--- a/mediatomb.spec
+++ b/mediatomb.spec
@@ -13,37 +13,39 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 24%{?dist}
+Release: 25%{?dist}.20120403gitb66dc1
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://mediatomb.cc
-Source0: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
+#Source0: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
+Source0: mediatomb-b66dc1.tar.bz2
 Source1: mediatomb.service
 # Adds handler for ogg audio metadata by default.  Submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3064466&group_id=129766&atid=715782
 Patch0: mediatomb-0.12.1.fixogg.patch
 # Fixes issue where video files > 999 minutes in length overrun the minutes buffer.
 Patch1: mediatomb-0.12.1.fixbufferoverrun.patch
 # Fix build issues related to GCC 4.6 (missing definitions.)  Submitted upstream
-Patch2: mediatomb-0.12.1.fixbuild.patch
+#Patch2: mediatomb-0.12.1.fixbuild.patch
 #Port to js-1.8 (thanks Jan!)  Submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3409482&group_id=129766&atid=715782
-Patch3: mediatomb-0.12.1.tonewjs.patch
+#Patch3: mediatomb-0.12.1.tonewjs.patch
 # Fixes to the js/native code to allow custom js parsing. Submitted upstream (with above)
-Patch4: mediatomb-0.12.1-jsparse.patch 
+#Patch4: mediatomb-0.12.1-jsparse.patch
 # Allows timeseeking on ps3.  http://sourceforge.net/tracker/?func=detail&aid=3309436&group_id=129766&atid=715782
 Patch5: mediatomb-0.12.1.ps3_timeseekrange.patch
 # Enable album art for FLAC based on libflac.  http://sourceforge.net/tracker/?func=detail&aid=2960326&group_id=129766&atid=715782
 Patch6: mediatomb-0.12.1.flacart.patch
-Patch7: mediatomb-0.12.1.flacart.config.patch
+#Patch7: mediatomb-0.12.1.flacart.config.patch
 # Fix youtube support.  RHBZ#747023, upstream bug http://sourceforge.net/tracker/?func=detail&aid=3382320&group_id=129766&atid=715780
 Patch8: mediatomb-0.12.1.fixyoutube.patch
 # Fix for gcc 4.7 build errors
-Patch9: mediatomb-0.12.1.gcc47.patch
+#Patch9: mediatomb-0.12.1.gcc47.patch
 # Add subtitles support: http://sourceforge.net/tracker/?func=detail&aid=3014026&group_id=129766&atid=715782
 Patch10: mediatomb-0.12.1-samsung_video_subtitles.patch
-Patch11: mediatomb-0.12.1-transcode-segfault.patch
-Patch12: mediatomb-0.12.1-unbundle-libupnp.patch
+#Patch11: mediatomb-0.12.1-transcode-segfault.patch
+#Patch12: mediatomb-0.12.1-unbundle-libupnp.patch
 
+Provides: bundled(libupnp)
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: automake
 BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel, flac-devel
@@ -51,7 +53,7 @@ BuildRequires: expat-devel, libcurl-devel
 BuildRequires: libmp4v2-devel
 BuildRequires: lastfmlib-devel
 BuildRequires: xulrunner-devel
-BuildRequires: libupnp-devel
+#BuildRequires: libupnp-devel
 Requires: mysql-libs, expat
 Requires(pre): shadow-utils
 %if %{with_sysvinit}
@@ -74,27 +76,27 @@ MediaTomb implements the UPnP MediaServer V 1.0 specification that can
 be found on http://www.upnp.org/.
 
 %prep 
-%setup -q
+%setup -qn mediatomb-b66dc1
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 # these two and patch9 fail the build on RHEL6
 %if ! %{rhel6}
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
+#%patch4 -p1
 %endif
 %patch5 -p0
 %patch6 -p0
-%patch7 -p1
+#%patch7 -p1
 %patch8 -p3
 %if ! %{rhel6}
-%patch9 -p0
+#%patch9 -p0
 %endif
 %patch10 -p0
-%patch11 -p0
-%patch12 -p1
+#%patch11 -p0
+#%patch12 -p1
 
-rm -rf tombupnp
+#rm -rf tombupnp
 
 %build
 # Patches affect configure.ac scripts, need to autoreconf
@@ -219,6 +221,10 @@ fi
 %endif
 
 %changelog
+* Wed Apr 03 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-25.20120403gitb66dc1
+- Re-bundle libupnp, patch for multiple CVEs
+- Update to latest git master.
+
 * Fri Feb 22 2013 Jon Ciesla <limburgher at gmail.com> - 0.12.1-24
 - Correct port handling in unbundle patch.
 
diff --git a/sources b/sources
index 4faf25d..b90d0f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e927dd5dc52d3cfcebd8ca1af6f0d3c2  mediatomb-0.12.1.tar.gz
+15d072d2782e5c37f4724594971fcb5c  mediatomb-b66dc1.tar.bz2