Merge lp:~kamalmostafa/ubuntu/lucid/pdp/fix-504941-ftbfs into lp:ubuntu/lucid/pdp

Proposed by Kamal Mostafa
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kamalmostafa/ubuntu/lucid/pdp/fix-504941-ftbfs
Merge into: lp:ubuntu/lucid/pdp
Diff against target: 55 lines (+23/-1)
4 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/patches/07_open_needs_3_args.patch (+14/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~kamalmostafa/ubuntu/lucid/pdp/fix-504941-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+17047@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kamal Mostafa (kamalmostafa) wrote :

Just the usual open(O_CREAT) fix.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-12-10 10:20:53 +0000
3+++ debian/changelog 2010-01-08 21:45:29 +0000
4@@ -1,3 +1,9 @@
5+pdp (1:0.12.5-1ubuntu1) lucid; urgency=high
6+
7+ * Fix FTBFS on Ubuntu Lucid: open(O_CREAT) needs 3 arguments (LP: #504941)
8+
9+ -- Kamal Mostafa <kamal@whence.com> Fri, 08 Jan 2010 12:50:27 -0800
10+
11 pdp (1:0.12.5-1) unstable; urgency=low
12
13 * Adopt package (closes: #521506)
14
15=== modified file 'debian/control'
16--- debian/control 2009-12-10 10:20:53 +0000
17+++ debian/control 2010-01-08 21:45:29 +0000
18@@ -1,7 +1,8 @@
19 Source: pdp
20 Section: graphics
21 Priority: extra
22-Maintainer: Paul Brossier <piem@debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Paul Brossier <piem@debian.org>
25 Build-Depends: debhelper (>> 7.0.50~),
26 quilt,
27 docbook-to-man,
28
29=== added file 'debian/patches/07_open_needs_3_args.patch'
30--- debian/patches/07_open_needs_3_args.patch 1970-01-01 00:00:00 +0000
31+++ debian/patches/07_open_needs_3_args.patch 2010-01-08 21:45:29 +0000
32@@ -0,0 +1,14 @@
33+=== modified file 'modules/generic/pdp_rawout.c'
34+--- a/modules/generic/pdp_rawout.c 2009-12-10 10:20:53 +0000
35++++ b/modules/generic/pdp_rawout.c 2010-01-08 20:47:34 +0000
36+@@ -138,7 +138,8 @@
37+
38+ /* open pipe */
39+ if (-1 == (pipefd = open(x->x_pipe->s_name, O_WRONLY|O_NONBLOCK|O_APPEND))){
40+- if (-1 == (pipefd = open(x->x_pipe->s_name, O_WRONLY|O_CREAT))){
41++ if (-1 == (pipefd = open(x->x_pipe->s_name, O_WRONLY|O_CREAT,
42++ S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH))){
43+ perror(me);
44+ goto exit;
45+ }
46+
47
48=== modified file 'debian/patches/series'
49--- debian/patches/series 2009-12-10 10:20:53 +0000
50+++ debian/patches/series 2010-01-08 21:45:29 +0000
51@@ -3,3 +3,4 @@
52 03_force_Wno-error.patch
53 05_kfreebsd.patch
54 06_add_v4l2.patch
55+07_open_needs_3_args.patch

Subscribers

People subscribed via source and target branches

to all changes: