Ubuntu
libjpeg6b package

Merge lp://staging/~noskcaj/ubuntu/wily/libjpeg6b/merge into lp://staging/ubuntu/wily/libjpeg6b

  1. Wily (15.10)
  2. merge
  3. Merge into wily
Proposed by Jackson Doak
Status: Rejected
Rejected by: Robert Ancell
Proposed branch: lp://staging/~noskcaj/ubuntu/wily/libjpeg6b/merge
Merge into: lp://staging/ubuntu/wily/libjpeg6b
Diff against target: 1762 lines (+115/-1508)
13 files modified
.pc/applied-patches (+1/-1)
.pc/fix-CVE-2013-6629_6630/jdmarker.c (+0/-1360)
README.6b1 (+0/-29)
README.6b2 (+42/-0)
configure.ac (+1/-1)
debian/changelog (+34/-0)
debian/control (+2/-2)
debian/copyright (+1/-1)
debian/patches/automake-Wno-obsolete (+19/-0)
debian/patches/fix-CVE-2013-6629_6630 (+0/-108)
debian/patches/series (+1/-1)
debian/rules (+11/-5)
jdmarker.c (+3/-0)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/wily/libjpeg6b/merge
Reviewer Review Type Date Requested Status
Robert Ancell Needs Information
Till Kamppeter Pending
Review via email: mp+265455@code.staging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

I looked at the difference between Debian and Ubuntu and there's no -Bsymbolic flags set. Not sure how long ago that changed!

The difference is we drop:
LDFLAGS=-Wl,-z,relro

Which may not actually be a problem.

I think we need Till to tell us if the stock Debian package still has an issue with the HP printer drivers as that was the original issue that got us to diverge (bug 777670).

review: Needs Information
Revision history for this message
Till Kamppeter (till-kamppeter) wrote :

The actual fix for the mentioned bug is removing "-Bsymbolic-functions" from LDFLAGS. I do not know whether this was also done in Debian. I also never tested the Debian package. Also I do not have the appropriate printer any more.

So please check whether the Debian package also has "-Bsymbolic-functions" removed and make sure that Ubuntu ships a JPEG package with "-Bsymbolic-functions" removed.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

OK, given that -Bsymbolic-functions is not in the Debian version I'm going to sync from Debian and we should diverge again if a printer issue turns up. Thanks for checking.

Unmerged revisions

20. By Jackson Doak

* Merge from Debian. Remaining changes:
  - debian/rules: Remove "-Bsymbolic-functions" from LDFLAGS.
* Bump epoch to recover from libjpeg-turbo hijacking of libjpeg62.
* debian/control:
  - Bump standard version to 3.9.6.
* New bugfix upstream release
  - patch fix-CVE-2013-6629_6630: removed
* debian/watch: added
* debian/rules:
  - Use dh_prep instead of dh_clean -k
  - Do not use -D_REENTRANT
  - Add -Wl,-z,relro to LDFLAGS
* debian/copyright:
  - Add new upstream URL
* debian/control:
  - Bump standard version to 3.9.5.
* debian/control, debian/rules:
  - Apply patch by Mauricio Faria de Oliveira to use dh_autoreconf
    closes: #753362

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: