diff --git a/.gitignore b/.gitignore index 6657875..d62267a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libdmapsharing-2.9.16.tar.gz +SOURCES/libdmapsharing-2.9.30.tar.gz diff --git a/.libdmapsharing.metadata b/.libdmapsharing.metadata index f78c3ba..a40e0b6 100644 --- a/.libdmapsharing.metadata +++ b/.libdmapsharing.metadata @@ -1 +1 @@ -7cdf9c83b829475c30c33b53282e74c58c699ec6 SOURCES/libdmapsharing-2.9.16.tar.gz +92cfeb4d6268fb733d88df60f4edbadfa4af340a SOURCES/libdmapsharing-2.9.30.tar.gz diff --git a/SOURCES/0001-Use-strlen-instead-of-hard-coding-string-length.patch b/SOURCES/0001-Use-strlen-instead-of-hard-coding-string-length.patch deleted file mode 100644 index 9d1375c..0000000 --- a/SOURCES/0001-Use-strlen-instead-of-hard-coding-string-length.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 617164b22dbbe17490377c56f8a859541e9fcfdb Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 29 Oct 2013 11:34:20 +0100 -Subject: [PATCH 1/3] Use strlen() instead of hard-coding string length - -This avoids hard to detect bugs when we want a different string length, -and will be optimised by the compiler anyway. - -https://bugzilla.gnome.org/show_bug.cgi?id=711063 ---- - libdmapsharing/daap-share.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c -index 6b719f5..66cdfe6 100644 ---- a/libdmapsharing/daap-share.c -+++ b/libdmapsharing/daap-share.c -@@ -922,7 +922,7 @@ databases_items_xxx (DMAPShare * share, - const gchar *s; - gchar *content_range; - -- s = range_header + 6; /* bytes= */ -+ s = range_header + strlen ("bytes="); /* bytes= */ - offset = atoll (s); - - content_range = --- -1.8.3.1 - diff --git a/SOURCES/0002-Avoid-OOB-read-with-buggy-servers.patch b/SOURCES/0002-Avoid-OOB-read-with-buggy-servers.patch deleted file mode 100644 index 45c74c1..0000000 --- a/SOURCES/0002-Avoid-OOB-read-with-buggy-servers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e347fd3e8e7e20afc562268f27fd3c2b79f4d0e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 29 Oct 2013 11:37:15 +0100 -Subject: [PATCH 2/3] Avoid OOB read with buggy servers - -If the server doesn't start the Content-Range field with "bytes=" -we would have an out-of-bounds read trying to parse the content -of that field. Fall back to a 0 offset when a parsing error occurs. - -See https://bugzilla.redhat.com/show_bug.cgi?id=1024020 - -https://bugzilla.gnome.org/show_bug.cgi?id=711063 ---- - libdmapsharing/daap-share.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c -index 66cdfe6..e182055 100644 ---- a/libdmapsharing/daap-share.c -+++ b/libdmapsharing/daap-share.c -@@ -922,8 +922,13 @@ databases_items_xxx (DMAPShare * share, - const gchar *s; - gchar *content_range; - -- s = range_header + strlen ("bytes="); /* bytes= */ -- offset = atoll (s); -+ if (!g_ascii_strncasecmp (range_header, "bytes=", strlen("bytes="))) { -+ /* Not starting with "bytes=" ? */ -+ offset = 0; -+ } else { -+ s = range_header + strlen ("bytes="); /* bytes= */ -+ offset = atoll (s); -+ } - - content_range = - g_strdup_printf ("bytes %" G_GUINT64_FORMAT "-%" --- -1.8.3.1 - diff --git a/SOURCES/0003-Fix-clang-warning.patch b/SOURCES/0003-Fix-clang-warning.patch deleted file mode 100644 index 59afb74..0000000 --- a/SOURCES/0003-Fix-clang-warning.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 28d26ba51dac6565a796a4e2c68ad28f89af398f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 29 Oct 2013 11:42:31 +0100 -Subject: [PATCH 3/3] Fix clang warning - -dmap-md5.c:187:26: warning: 'memset' call operates on objects of type 'MD5_CTX' -while the size is based on a different - type 'MD5_CTX *' [-Wsizeof-pointer-memaccess] - memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */ - ~~~ ^~~ - -That should be "sizeof(*ctx)" instead. - -See https://bugzilla.redhat.com/show_bug.cgi?id=1023528 - -https://bugzilla.gnome.org/show_bug.cgi?id=711063 ---- - libdmapsharing/dmap-md5.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdmapsharing/dmap-md5.c b/libdmapsharing/dmap-md5.c -index 4472472..c646d6c 100644 ---- a/libdmapsharing/dmap-md5.c -+++ b/libdmapsharing/dmap-md5.c -@@ -176,7 +176,7 @@ DMAP_MD5Final (DMAPHashContext * ctx, unsigned char digest[16]) - MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version); - byteReverse ((unsigned char *) ctx->buf, 4); - memcpy (digest, ctx->buf, 16); -- memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */ -+ memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */ - - return; - } --- -1.8.3.1 - diff --git a/SPECS/libdmapsharing.spec b/SPECS/libdmapsharing.spec index 5169028..5caa741 100644 --- a/SPECS/libdmapsharing.spec +++ b/SPECS/libdmapsharing.spec @@ -1,6 +1,6 @@ Name: libdmapsharing -Version: 2.9.16 -Release: 4%{?dist} +Version: 2.9.30 +Release: 1%{?dist} License: LGPLv2+ Source: http://www.flyn.org/projects/libdmapsharing/%{name}-%{version}.tar.gz URL: http://www.flyn.org/projects/libdmapsharing/ @@ -10,10 +10,6 @@ BuildRequires: pkgconfig, glib2-devel, libsoup-devel >= 2.32 BuildRequires: avahi-glib-devel, gdk-pixbuf2-devel, gstreamer1-plugins-base-devel BuildRequires: git -Patch0: 0001-Use-strlen-instead-of-hard-coding-string-length.patch -Patch1: 0002-Avoid-OOB-read-with-buggy-servers.patch -Patch2: 0003-Fix-clang-warning.patch - %description libdmapsharing implements the DMAP protocols. This includes support for DAAP and DPAP. @@ -38,6 +34,7 @@ other resources needed for developing applications using libdmapsharing. %{_includedir}/libdmapsharing-3.0/ %{_libdir}/libdmapsharing-3.0.so %{_datadir}/gtk-doc/html/libdmapsharing-3.0 +%{_datadir}/vala/vapi/libdmapsharing-3.0.vapi %prep %setup -q @@ -65,6 +62,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdmapsharing-3.0.la %postun -p /sbin/ldconfig %changelog +* Wed May 20 2015 Bastien Nocera 2.9.30-1 +- Update to 2.9.30 +Resolves: #1221283 + * Fri Jan 24 2014 Daniel Mach - 2.9.16-4 - Mass rebuild 2014-01-24