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
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-08-29 12:30:01 +0000
3+++ ChangeLog 2014-02-22 05:59:28 +0000
4@@ -1,3 +1,62 @@
5+commit 1da947bfbabba1567bdd9c5e2bbb082b8de7d0ec
6+Author: W. Michael Petullo <mike@flyn.org>
7+Date: Thu Nov 7 08:56:03 2013 -0500
8+
9+ Bump version number
10+
11+ Signed-off-by: W. Michael Petullo <mike@flyn.org>
12+
13+commit 0f6010e429430867f80ed9933228d69dac783679
14+Author: W. Michael Petullo <mike@flyn.org>
15+Date: Thu Nov 7 08:41:50 2013 -0500
16+
17+ Update libdmapsharing.spec
18+
19+ Signed-off-by: W. Michael Petullo <mike@flyn.org>
20+
21+commit 28d26ba51dac6565a796a4e2c68ad28f89af398f
22+Author: Bastien Nocera <hadess@hadess.net>
23+Date: Tue Oct 29 11:42:31 2013 +0100
24+
25+ Fix clang warning
26+
27+ dmap-md5.c:187:26: warning: 'memset' call operates on objects of type 'MD5_CTX'
28+ while the size is based on a different
29+ type 'MD5_CTX *' [-Wsizeof-pointer-memaccess]
30+ memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
31+ ~~~ ^~~
32+
33+ That should be "sizeof(*ctx)" instead.
34+
35+ See https://bugzilla.redhat.com/show_bug.cgi?id=1023528
36+
37+ https://bugzilla.gnome.org/show_bug.cgi?id=711063
38+
39+commit 3e347fd3e8e7e20afc562268f27fd3c2b79f4d0e
40+Author: Bastien Nocera <hadess@hadess.net>
41+Date: Tue Oct 29 11:37:15 2013 +0100
42+
43+ Avoid OOB read with buggy servers
44+
45+ If the server doesn't start the Content-Range field with "bytes="
46+ we would have an out-of-bounds read trying to parse the content
47+ of that field. Fall back to a 0 offset when a parsing error occurs.
48+
49+ See https://bugzilla.redhat.com/show_bug.cgi?id=1024020
50+
51+ https://bugzilla.gnome.org/show_bug.cgi?id=711063
52+
53+commit 617164b22dbbe17490377c56f8a859541e9fcfdb
54+Author: Bastien Nocera <hadess@hadess.net>
55+Date: Tue Oct 29 11:34:20 2013 +0100
56+
57+ Use strlen() instead of hard-coding string length
58+
59+ This avoids hard to detect bugs when we want a different string length,
60+ and will be optimised by the compiler anyway.
61+
62+ https://bugzilla.gnome.org/show_bug.cgi?id=711063
63+
64 commit 577b6705f5ef480721f894f1c2e79a62b36051f7
65 Author: W. Michael Petullo <mike@flyn.org>
66 Date: Sun Aug 25 19:52:35 2013 -0400
67
68=== modified file 'configure'
69--- configure 2013-08-29 12:30:01 +0000
70+++ configure 2014-02-22 05:59:28 +0000
71@@ -1,6 +1,6 @@
72 #! /bin/sh
73 # Guess values for system-dependent variables and create Makefiles.
74-# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.23.
75+# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.24.
76 #
77 #
78 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
79@@ -647,8 +647,8 @@
80 # Identity of this package.
81 PACKAGE_NAME='libdmapsharing'
82 PACKAGE_TARNAME='libdmapsharing'
83-PACKAGE_VERSION='2.9.23'
84-PACKAGE_STRING='libdmapsharing 2.9.23'
85+PACKAGE_VERSION='2.9.24'
86+PACKAGE_STRING='libdmapsharing 2.9.24'
87 PACKAGE_BUGREPORT=''
88 PACKAGE_URL=''
89
90@@ -1494,7 +1494,7 @@
91 # Omit some internal or obsolete options to make the list less imposing.
92 # This message is too long to be a string in the A/UX 3.1 sh.
93 cat <<_ACEOF
94-\`configure' configures libdmapsharing 2.9.23 to adapt to many kinds of systems.
95+\`configure' configures libdmapsharing 2.9.24 to adapt to many kinds of systems.
96
97 Usage: $0 [OPTION]... [VAR=VALUE]...
98
99@@ -1564,7 +1564,7 @@
100
101 if test -n "$ac_init_help"; then
102 case $ac_init_help in
103- short | recursive ) echo "Configuration of libdmapsharing 2.9.23:";;
104+ short | recursive ) echo "Configuration of libdmapsharing 2.9.24:";;
105 esac
106 cat <<\_ACEOF
107
108@@ -1734,7 +1734,7 @@
109 test -n "$ac_init_help" && exit $ac_status
110 if $ac_init_version; then
111 cat <<\_ACEOF
112-libdmapsharing configure 2.9.23
113+libdmapsharing configure 2.9.24
114 generated by GNU Autoconf 2.69
115
116 Copyright (C) 2012 Free Software Foundation, Inc.
117@@ -2099,7 +2099,7 @@
118 This file contains any messages produced by compilers while
119 running configure, to aid debugging if configure makes a mistake.
120
121-It was created by libdmapsharing $as_me 2.9.23, which was
122+It was created by libdmapsharing $as_me 2.9.24, which was
123 generated by GNU Autoconf 2.69. Invocation command line was
124
125 $ $0 $@
126@@ -2452,20 +2452,20 @@
127 PACKAGE=libdmapsharing
128 LIBDMAPSHARING_MAJOR_VERSION=2
129 LIBDMAPSHARING_MINOR_VERSION=9
130- LIBDMAPSHARING_MICRO_VERSION=23
131+ LIBDMAPSHARING_MICRO_VERSION=24
132 NANO=LIBDMAPSHARING_CVS="no"
133 LIBDMAPSHARING_NANO_VERSION=$NANO
134 if test "x$NANO" = "x" || test "x$NANO" = "x0";
135 then
136 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for release" >&5
137 $as_echo "$as_me: configuring libdmapsharing for release" >&6;}
138- VERSION=2.9.23
139+ VERSION=2.9.24
140 LIBDMAPSHARING_RELEASE=1
141 LIBDMAPSHARING_CVS="yes"
142 else
143 { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for development with nano $NANO" >&5
144 $as_echo "$as_me: configuring libdmapsharing for development with nano $NANO" >&6;}
145- VERSION=2.9.23.$NANO
146+ VERSION=2.9.24.$NANO
147 LIBDMAPSHARING_RELEASE=`date +%Y%m%d_%H%M%S`
148 :
149 fi
150@@ -3017,7 +3017,7 @@
151
152 # Define the identity of the package.
153 PACKAGE='libdmapsharing'
154- VERSION='2.9.23'
155+ VERSION='2.9.24'
156
157
158 cat >>confdefs.h <<_ACEOF
159@@ -7446,7 +7446,7 @@
160 rm -rf conftest*
161 ;;
162
163-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
164+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
165 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
166 # Find out which ABI we are using.
167 echo 'int i;' > conftest.$ac_ext
168@@ -7464,7 +7464,10 @@
169 x86_64-*linux*)
170 LD="${LD-ld} -m elf_i386"
171 ;;
172- ppc64-*linux*|powerpc64-*linux*)
173+ powerpcle-*linux*)
174+ LD="${LD-ld} -m elf32lppclinux"
175+ ;;
176+ powerpc-*linux*)
177 LD="${LD-ld} -m elf32ppclinux"
178 ;;
179 s390x-*linux*)
180@@ -7483,7 +7486,10 @@
181 x86_64-*linux*)
182 LD="${LD-ld} -m elf_x86_64"
183 ;;
184- ppc*-*linux*|powerpc*-*linux*)
185+ powerpcle-*linux*)
186+ LD="${LD-ld} -m elf64lppc"
187+ ;;
188+ powerpc-*linux*)
189 LD="${LD-ld} -m elf64ppc"
190 ;;
191 s390*-*linux*|s390*-*tpf*)
192@@ -15372,7 +15378,7 @@
193 # report actual input values of CONFIG_FILES etc. instead of their
194 # values after options handling.
195 ac_log="
196-This file was extended by libdmapsharing $as_me 2.9.23, which was
197+This file was extended by libdmapsharing $as_me 2.9.24, which was
198 generated by GNU Autoconf 2.69. Invocation command line was
199
200 CONFIG_FILES = $CONFIG_FILES
201@@ -15438,7 +15444,7 @@
202 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
203 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
204 ac_cs_version="\\
205-libdmapsharing config.status 2.9.23
206+libdmapsharing config.status 2.9.24
207 configured by $0, generated by GNU Autoconf 2.69,
208 with options \\"\$ac_cs_config\\"
209
210
211=== modified file 'configure.ac'
212--- configure.ac 2013-08-29 12:30:01 +0000
213+++ configure.ac 2014-02-22 05:59:28 +0000
214@@ -1,8 +1,8 @@
215-AC_INIT(libdmapsharing, 2.9.23)
216+AC_INIT(libdmapsharing, 2.9.24)
217
218 dnl when going to/from release please set the nano (fourth number) right !
219 dnl releases only do Wall, cvs and prerelease does Werror too
220-AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 23, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
221+AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 24, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
222
223 dnl FIXME:
224 dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
225
226=== modified file 'debian/changelog'
227--- debian/changelog 2013-12-18 14:03:31 +0000
228+++ debian/changelog 2014-02-22 05:59:28 +0000
229@@ -1,3 +1,9 @@
230+libdmapsharing (2.9.24-0ubuntu1) trusty; urgency=medium
231+
232+ * New upstream bugfix release.
233+
234+ -- Jackson Doak <noskcaj@ubuntu.com> Sat, 22 Feb 2014 10:48:55 +1100
235+
236 libdmapsharing (2.9.23-1ubuntu1) trusty; urgency=medium
237
238 * Build using dh-autoreconf.
239
240=== modified file 'debian/control'
241--- debian/control 2013-12-18 14:03:31 +0000
242+++ debian/control 2014-02-22 05:59:28 +0000
243@@ -5,7 +5,8 @@
244 Source: libdmapsharing
245 Section: libs
246 Priority: optional
247-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
248+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
249+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
250 Uploaders: Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
251 Build-Depends: debhelper (>= 9),
252 dh-autoreconf,
253
254=== modified file 'debian/control.in'
255--- debian/control.in 2013-12-18 14:03:31 +0000
256+++ debian/control.in 2014-02-22 05:59:28 +0000
257@@ -1,7 +1,8 @@
258 Source: libdmapsharing
259 Section: libs
260 Priority: optional
261-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
262+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
263+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
264 Uploaders: @GNOME_TEAM@
265 Build-Depends: debhelper (>= 9),
266 dh-autoreconf,
267
268=== modified file 'libdmapsharing-3.0-uninstalled.pc'
269--- libdmapsharing-3.0-uninstalled.pc 2013-08-29 12:30:01 +0000
270+++ libdmapsharing-3.0-uninstalled.pc 2014-02-22 05:59:28 +0000
271@@ -5,7 +5,7 @@
272
273 Name: libdmapsharing
274 Description: libdmapsharing
275-Version: 2.9.23
276+Version: 2.9.24
277 Requires: glib-2.0 libsoup-2.4 gstreamer-1.0
278 Libs: -L${libdir} -ldmapsharing-3.0
279 Cflags: -I${includedir}
280
281=== modified file 'libdmapsharing/daap-share.c'
282--- libdmapsharing/daap-share.c 2013-08-29 12:30:01 +0000
283+++ libdmapsharing/daap-share.c 2014-02-22 05:59:28 +0000
284@@ -922,8 +922,13 @@
285 const gchar *s;
286 gchar *content_range;
287
288- s = range_header + 6; /* bytes= */
289- offset = atoll (s);
290+ if (!g_ascii_strncasecmp (range_header, "bytes=", strlen("bytes="))) {
291+ /* Not starting with "bytes=" ? */
292+ offset = 0;
293+ } else {
294+ s = range_header + strlen ("bytes="); /* bytes= */
295+ offset = atoll (s);
296+ }
297
298 content_range =
299 g_strdup_printf ("bytes %" G_GUINT64_FORMAT "-%"
300
301=== modified file 'libdmapsharing/dmap-md5.c'
302--- libdmapsharing/dmap-md5.c 2013-08-29 12:30:01 +0000
303+++ libdmapsharing/dmap-md5.c 2014-02-22 05:59:28 +0000
304@@ -176,7 +176,7 @@
305 MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
306 byteReverse ((unsigned char *) ctx->buf, 4);
307 memcpy (digest, ctx->buf, 16);
308- memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
309+ memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
310
311 return;
312 }
313
314=== modified file 'm4/libtool.m4'
315--- m4/libtool.m4 2013-05-15 11:01:16 +0000
316+++ m4/libtool.m4 2014-02-22 05:59:28 +0000
317@@ -1312,7 +1312,7 @@
318 rm -rf conftest*
319 ;;
320
321-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
322+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
323 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
324 # Find out which ABI we are using.
325 echo 'int i;' > conftest.$ac_ext
326@@ -1326,7 +1326,10 @@
327 x86_64-*linux*)
328 LD="${LD-ld} -m elf_i386"
329 ;;
330- ppc64-*linux*|powerpc64-*linux*)
331+ powerpcle-*linux*)
332+ LD="${LD-ld} -m elf32lppclinux"
333+ ;;
334+ powerpc-*linux*)
335 LD="${LD-ld} -m elf32ppclinux"
336 ;;
337 s390x-*linux*)
338@@ -1345,7 +1348,10 @@
339 x86_64-*linux*)
340 LD="${LD-ld} -m elf_x86_64"
341 ;;
342- ppc*-*linux*|powerpc*-*linux*)
343+ powerpcle-*linux*)
344+ LD="${LD-ld} -m elf64lppc"
345+ ;;
346+ powerpc-*linux*)
347 LD="${LD-ld} -m elf64ppc"
348 ;;
349 s390*-*linux*|s390*-*tpf*)

Subscribers

People subscribed via source and target branches

to all changes: