Ubuntu
libdmapsharing package

Merge lp:~noskcaj/ubuntu/trusty/libdmapsharing/2.9.24 into lp:ubuntu/trusty/libdmapsharing

  1. Trusty (14.04)
  2. 2.9.24
  3. Merge into trusty
Proposed by Jackson Doak
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 21
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/trusty/libdmapsharing/2.9.24
Merge into: lp:ubuntu/trusty/libdmapsharing
Diff against target: 349 lines (+111/-27)
10 files modified
ChangeLog (+59/-0)
configure (+22/-16)
configure.ac (+2/-2)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
libdmapsharing-3.0-uninstalled.pc (+1/-1)
libdmapsharing/daap-share.c (+7/-2)
libdmapsharing/dmap-md5.c (+1/-1)
m4/libtool.m4 (+9/-3)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/trusty/libdmapsharing/2.9.24
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+207776@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for your work

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2013-08-29 12:30:01 +0000
+++ ChangeLog 2014-02-22 05:59:28 +0000
@@ -1,3 +1,62 @@
1commit 1da947bfbabba1567bdd9c5e2bbb082b8de7d0ec
2Author: W. Michael Petullo <mike@flyn.org>
3Date: Thu Nov 7 08:56:03 2013 -0500
4
5 Bump version number
6
7 Signed-off-by: W. Michael Petullo <mike@flyn.org>
8
9commit 0f6010e429430867f80ed9933228d69dac783679
10Author: W. Michael Petullo <mike@flyn.org>
11Date: Thu Nov 7 08:41:50 2013 -0500
12
13 Update libdmapsharing.spec
14
15 Signed-off-by: W. Michael Petullo <mike@flyn.org>
16
17commit 28d26ba51dac6565a796a4e2c68ad28f89af398f
18Author: Bastien Nocera <hadess@hadess.net>
19Date: Tue Oct 29 11:42:31 2013 +0100
20
21 Fix clang warning
22
23 dmap-md5.c:187:26: warning: 'memset' call operates on objects of type 'MD5_CTX'
24 while the size is based on a different
25 type 'MD5_CTX *' [-Wsizeof-pointer-memaccess]
26 memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
27 ~~~ ^~~
28
29 That should be "sizeof(*ctx)" instead.
30
31 See https://bugzilla.redhat.com/show_bug.cgi?id=1023528
32
33 https://bugzilla.gnome.org/show_bug.cgi?id=711063
34
35commit 3e347fd3e8e7e20afc562268f27fd3c2b79f4d0e
36Author: Bastien Nocera <hadess@hadess.net>
37Date: Tue Oct 29 11:37:15 2013 +0100
38
39 Avoid OOB read with buggy servers
40
41 If the server doesn't start the Content-Range field with "bytes="
42 we would have an out-of-bounds read trying to parse the content
43 of that field. Fall back to a 0 offset when a parsing error occurs.
44
45 See https://bugzilla.redhat.com/show_bug.cgi?id=1024020
46
47 https://bugzilla.gnome.org/show_bug.cgi?id=711063
48
49commit 617164b22dbbe17490377c56f8a859541e9fcfdb
50Author: Bastien Nocera <hadess@hadess.net>
51Date: Tue Oct 29 11:34:20 2013 +0100
52
53 Use strlen() instead of hard-coding string length
54
55 This avoids hard to detect bugs when we want a different string length,
56 and will be optimised by the compiler anyway.
57
58 https://bugzilla.gnome.org/show_bug.cgi?id=711063
59
1commit 577b6705f5ef480721f894f1c2e79a62b36051f760commit 577b6705f5ef480721f894f1c2e79a62b36051f7
2Author: W. Michael Petullo <mike@flyn.org>61Author: W. Michael Petullo <mike@flyn.org>
3Date: Sun Aug 25 19:52:35 2013 -040062Date: Sun Aug 25 19:52:35 2013 -0400
463
=== modified file 'configure'
--- configure 2013-08-29 12:30:01 +0000
+++ configure 2014-02-22 05:59:28 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.23.3# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.24.
4#4#
5#5#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -647,8 +647,8 @@
647# Identity of this package.647# Identity of this package.
648PACKAGE_NAME='libdmapsharing'648PACKAGE_NAME='libdmapsharing'
649PACKAGE_TARNAME='libdmapsharing'649PACKAGE_TARNAME='libdmapsharing'
650PACKAGE_VERSION='2.9.23'650PACKAGE_VERSION='2.9.24'
651PACKAGE_STRING='libdmapsharing 2.9.23'651PACKAGE_STRING='libdmapsharing 2.9.24'
652PACKAGE_BUGREPORT=''652PACKAGE_BUGREPORT=''
653PACKAGE_URL=''653PACKAGE_URL=''
654654
@@ -1494,7 +1494,7 @@
1494 # Omit some internal or obsolete options to make the list less imposing.1494 # Omit some internal or obsolete options to make the list less imposing.
1495 # This message is too long to be a string in the A/UX 3.1 sh.1495 # This message is too long to be a string in the A/UX 3.1 sh.
1496 cat <<_ACEOF1496 cat <<_ACEOF
1497\`configure' configures libdmapsharing 2.9.23 to adapt to many kinds of systems.1497\`configure' configures libdmapsharing 2.9.24 to adapt to many kinds of systems.
14981498
1499Usage: $0 [OPTION]... [VAR=VALUE]...1499Usage: $0 [OPTION]... [VAR=VALUE]...
15001500
@@ -1564,7 +1564,7 @@
15641564
1565if test -n "$ac_init_help"; then1565if test -n "$ac_init_help"; then
1566 case $ac_init_help in1566 case $ac_init_help in
1567 short | recursive ) echo "Configuration of libdmapsharing 2.9.23:";;1567 short | recursive ) echo "Configuration of libdmapsharing 2.9.24:";;
1568 esac1568 esac
1569 cat <<\_ACEOF1569 cat <<\_ACEOF
15701570
@@ -1734,7 +1734,7 @@
1734test -n "$ac_init_help" && exit $ac_status1734test -n "$ac_init_help" && exit $ac_status
1735if $ac_init_version; then1735if $ac_init_version; then
1736 cat <<\_ACEOF1736 cat <<\_ACEOF
1737libdmapsharing configure 2.9.231737libdmapsharing configure 2.9.24
1738generated by GNU Autoconf 2.691738generated by GNU Autoconf 2.69
17391739
1740Copyright (C) 2012 Free Software Foundation, Inc.1740Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2099,7 +2099,7 @@
2099This file contains any messages produced by compilers while2099This file contains any messages produced by compilers while
2100running configure, to aid debugging if configure makes a mistake.2100running configure, to aid debugging if configure makes a mistake.
21012101
2102It was created by libdmapsharing $as_me 2.9.23, which was2102It was created by libdmapsharing $as_me 2.9.24, which was
2103generated by GNU Autoconf 2.69. Invocation command line was2103generated by GNU Autoconf 2.69. Invocation command line was
21042104
2105 $ $0 $@2105 $ $0 $@
@@ -2452,20 +2452,20 @@
2452 PACKAGE=libdmapsharing2452 PACKAGE=libdmapsharing
2453 LIBDMAPSHARING_MAJOR_VERSION=22453 LIBDMAPSHARING_MAJOR_VERSION=2
2454 LIBDMAPSHARING_MINOR_VERSION=92454 LIBDMAPSHARING_MINOR_VERSION=9
2455 LIBDMAPSHARING_MICRO_VERSION=232455 LIBDMAPSHARING_MICRO_VERSION=24
2456 NANO=LIBDMAPSHARING_CVS="no"2456 NANO=LIBDMAPSHARING_CVS="no"
2457 LIBDMAPSHARING_NANO_VERSION=$NANO2457 LIBDMAPSHARING_NANO_VERSION=$NANO
2458 if test "x$NANO" = "x" || test "x$NANO" = "x0";2458 if test "x$NANO" = "x" || test "x$NANO" = "x0";
2459 then2459 then
2460 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for release" >&52460 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for release" >&5
2461$as_echo "$as_me: configuring libdmapsharing for release" >&6;}2461$as_echo "$as_me: configuring libdmapsharing for release" >&6;}
2462 VERSION=2.9.232462 VERSION=2.9.24
2463 LIBDMAPSHARING_RELEASE=12463 LIBDMAPSHARING_RELEASE=1
2464 LIBDMAPSHARING_CVS="yes"2464 LIBDMAPSHARING_CVS="yes"
2465 else2465 else
2466 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for development with nano $NANO" >&52466 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for development with nano $NANO" >&5
2467$as_echo "$as_me: configuring libdmapsharing for development with nano $NANO" >&6;}2467$as_echo "$as_me: configuring libdmapsharing for development with nano $NANO" >&6;}
2468 VERSION=2.9.23.$NANO2468 VERSION=2.9.24.$NANO
2469 LIBDMAPSHARING_RELEASE=`date +%Y%m%d_%H%M%S`2469 LIBDMAPSHARING_RELEASE=`date +%Y%m%d_%H%M%S`
2470 :2470 :
2471 fi2471 fi
@@ -3017,7 +3017,7 @@
30173017
3018# Define the identity of the package.3018# Define the identity of the package.
3019 PACKAGE='libdmapsharing'3019 PACKAGE='libdmapsharing'
3020 VERSION='2.9.23'3020 VERSION='2.9.24'
30213021
30223022
3023cat >>confdefs.h <<_ACEOF3023cat >>confdefs.h <<_ACEOF
@@ -7446,7 +7446,7 @@
7446 rm -rf conftest*7446 rm -rf conftest*
7447 ;;7447 ;;
74487448
7449x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \7449x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
7450s390*-*linux*|s390*-*tpf*|sparc*-*linux*)7450s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
7451 # Find out which ABI we are using.7451 # Find out which ABI we are using.
7452 echo 'int i;' > conftest.$ac_ext7452 echo 'int i;' > conftest.$ac_ext
@@ -7464,7 +7464,10 @@
7464 x86_64-*linux*)7464 x86_64-*linux*)
7465 LD="${LD-ld} -m elf_i386"7465 LD="${LD-ld} -m elf_i386"
7466 ;;7466 ;;
7467 ppc64-*linux*|powerpc64-*linux*)7467 powerpcle-*linux*)
7468 LD="${LD-ld} -m elf32lppclinux"
7469 ;;
7470 powerpc-*linux*)
7468 LD="${LD-ld} -m elf32ppclinux"7471 LD="${LD-ld} -m elf32ppclinux"
7469 ;;7472 ;;
7470 s390x-*linux*)7473 s390x-*linux*)
@@ -7483,7 +7486,10 @@
7483 x86_64-*linux*)7486 x86_64-*linux*)
7484 LD="${LD-ld} -m elf_x86_64"7487 LD="${LD-ld} -m elf_x86_64"
7485 ;;7488 ;;
7486 ppc*-*linux*|powerpc*-*linux*)7489 powerpcle-*linux*)
7490 LD="${LD-ld} -m elf64lppc"
7491 ;;
7492 powerpc-*linux*)
7487 LD="${LD-ld} -m elf64ppc"7493 LD="${LD-ld} -m elf64ppc"
7488 ;;7494 ;;
7489 s390*-*linux*|s390*-*tpf*)7495 s390*-*linux*|s390*-*tpf*)
@@ -15372,7 +15378,7 @@
15372# report actual input values of CONFIG_FILES etc. instead of their15378# report actual input values of CONFIG_FILES etc. instead of their
15373# values after options handling.15379# values after options handling.
15374ac_log="15380ac_log="
15375This file was extended by libdmapsharing $as_me 2.9.23, which was15381This file was extended by libdmapsharing $as_me 2.9.24, which was
15376generated by GNU Autoconf 2.69. Invocation command line was15382generated by GNU Autoconf 2.69. Invocation command line was
1537715383
15378 CONFIG_FILES = $CONFIG_FILES15384 CONFIG_FILES = $CONFIG_FILES
@@ -15438,7 +15444,7 @@
15438cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=115444cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15439ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"15445ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15440ac_cs_version="\\15446ac_cs_version="\\
15441libdmapsharing config.status 2.9.2315447libdmapsharing config.status 2.9.24
15442configured by $0, generated by GNU Autoconf 2.69,15448configured by $0, generated by GNU Autoconf 2.69,
15443 with options \\"\$ac_cs_config\\"15449 with options \\"\$ac_cs_config\\"
1544415450
1544515451
=== modified file 'configure.ac'
--- configure.ac 2013-08-29 12:30:01 +0000
+++ configure.ac 2014-02-22 05:59:28 +0000
@@ -1,8 +1,8 @@
1AC_INIT(libdmapsharing, 2.9.23)1AC_INIT(libdmapsharing, 2.9.24)
22
3dnl when going to/from release please set the nano (fourth number) right !3dnl when going to/from release please set the nano (fourth number) right !
4dnl releases only do Wall, cvs and prerelease does Werror too4dnl releases only do Wall, cvs and prerelease does Werror too
5AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 23, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")5AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 24, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
66
7dnl FIXME:7dnl FIXME:
8dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.8dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
99
=== modified file 'debian/changelog'
--- debian/changelog 2013-12-18 14:03:31 +0000
+++ debian/changelog 2014-02-22 05:59:28 +0000
@@ -1,3 +1,9 @@
1libdmapsharing (2.9.24-0ubuntu1) trusty; urgency=medium
2
3 * New upstream bugfix release.
4
5 -- Jackson Doak <noskcaj@ubuntu.com> Sat, 22 Feb 2014 10:48:55 +1100
6
1libdmapsharing (2.9.23-1ubuntu1) trusty; urgency=medium7libdmapsharing (2.9.23-1ubuntu1) trusty; urgency=medium
28
3 * Build using dh-autoreconf.9 * Build using dh-autoreconf.
410
=== modified file 'debian/control'
--- debian/control 2013-12-18 14:03:31 +0000
+++ debian/control 2014-02-22 05:59:28 +0000
@@ -5,7 +5,8 @@
5Source: libdmapsharing5Source: libdmapsharing
6Section: libs6Section: libs
7Priority: optional7Priority: optional
8Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
9Uploaders: Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>10Uploaders: Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
10Build-Depends: debhelper (>= 9),11Build-Depends: debhelper (>= 9),
11 dh-autoreconf,12 dh-autoreconf,
1213
=== modified file 'debian/control.in'
--- debian/control.in 2013-12-18 14:03:31 +0000
+++ debian/control.in 2014-02-22 05:59:28 +0000
@@ -1,7 +1,8 @@
1Source: libdmapsharing1Source: libdmapsharing
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
5Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
6Build-Depends: debhelper (>= 9),7Build-Depends: debhelper (>= 9),
7 dh-autoreconf,8 dh-autoreconf,
89
=== modified file 'libdmapsharing-3.0-uninstalled.pc'
--- libdmapsharing-3.0-uninstalled.pc 2013-08-29 12:30:01 +0000
+++ libdmapsharing-3.0-uninstalled.pc 2014-02-22 05:59:28 +0000
@@ -5,7 +5,7 @@
55
6Name: libdmapsharing6Name: libdmapsharing
7Description: libdmapsharing7Description: libdmapsharing
8Version: 2.9.238Version: 2.9.24
9Requires: glib-2.0 libsoup-2.4 gstreamer-1.09Requires: glib-2.0 libsoup-2.4 gstreamer-1.0
10Libs: -L${libdir} -ldmapsharing-3.010Libs: -L${libdir} -ldmapsharing-3.0
11Cflags: -I${includedir}11Cflags: -I${includedir}
1212
=== modified file 'libdmapsharing/daap-share.c'
--- libdmapsharing/daap-share.c 2013-08-29 12:30:01 +0000
+++ libdmapsharing/daap-share.c 2014-02-22 05:59:28 +0000
@@ -922,8 +922,13 @@
922 const gchar *s;922 const gchar *s;
923 gchar *content_range;923 gchar *content_range;
924924
925 s = range_header + 6; /* bytes= */925 if (!g_ascii_strncasecmp (range_header, "bytes=", strlen("bytes="))) {
926 offset = atoll (s);926 /* Not starting with "bytes=" ? */
927 offset = 0;
928 } else {
929 s = range_header + strlen ("bytes="); /* bytes= */
930 offset = atoll (s);
931 }
927932
928 content_range =933 content_range =
929 g_strdup_printf ("bytes %" G_GUINT64_FORMAT "-%"934 g_strdup_printf ("bytes %" G_GUINT64_FORMAT "-%"
930935
=== modified file 'libdmapsharing/dmap-md5.c'
--- libdmapsharing/dmap-md5.c 2013-08-29 12:30:01 +0000
+++ libdmapsharing/dmap-md5.c 2014-02-22 05:59:28 +0000
@@ -176,7 +176,7 @@
176 MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);176 MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
177 byteReverse ((unsigned char *) ctx->buf, 4);177 byteReverse ((unsigned char *) ctx->buf, 4);
178 memcpy (digest, ctx->buf, 16);178 memcpy (digest, ctx->buf, 16);
179 memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */179 memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
180180
181 return;181 return;
182}182}
183183
=== modified file 'm4/libtool.m4'
--- m4/libtool.m4 2013-05-15 11:01:16 +0000
+++ m4/libtool.m4 2014-02-22 05:59:28 +0000
@@ -1312,7 +1312,7 @@
1312 rm -rf conftest*1312 rm -rf conftest*
1313 ;;1313 ;;
13141314
1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*)1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1317 # Find out which ABI we are using.1317 # Find out which ABI we are using.
1318 echo 'int i;' > conftest.$ac_ext1318 echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
1326 x86_64-*linux*)1326 x86_64-*linux*)
1327 LD="${LD-ld} -m elf_i386"1327 LD="${LD-ld} -m elf_i386"
1328 ;;1328 ;;
1329 ppc64-*linux*|powerpc64-*linux*)1329 powerpcle-*linux*)
1330 LD="${LD-ld} -m elf32lppclinux"
1331 ;;
1332 powerpc-*linux*)
1330 LD="${LD-ld} -m elf32ppclinux"1333 LD="${LD-ld} -m elf32ppclinux"
1331 ;;1334 ;;
1332 s390x-*linux*)1335 s390x-*linux*)
@@ -1345,7 +1348,10 @@
1345 x86_64-*linux*)1348 x86_64-*linux*)
1346 LD="${LD-ld} -m elf_x86_64"1349 LD="${LD-ld} -m elf_x86_64"
1347 ;;1350 ;;
1348 ppc*-*linux*|powerpc*-*linux*)1351 powerpcle-*linux*)
1352 LD="${LD-ld} -m elf64lppc"
1353 ;;
1354 powerpc-*linux*)
1349 LD="${LD-ld} -m elf64ppc"1355 LD="${LD-ld} -m elf64ppc"
1350 ;;1356 ;;
1351 s390*-*linux*|s390*-*tpf*)1357 s390*-*linux*|s390*-*tpf*)

Subscribers

People subscribed via source and target branches

to all changes: