Bug#343132: stderr not available with udev
This is also triggered when you don't have udev installed. The default /dev doesn't include the links into /proc/self/fd. This also affects the security fixes for sarge. -apw -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#411867: network-manager fails to recognise WEP AP requires key
Package: network-manager
Version: 0.6.4-6
Severity: important
Tags: patch
Since a recent upgrade network-manager no longer lists my
WEP enabled access point as protected; no padlock is shown
in the menu. When selecting this AP no keys are loaded.
When we find a WEP enabled access point we will accumulate
its 'capabilities' in add_capabilities_from_cipher(). For
WEP this is handled with the following stanza:
if (cipher IW_AUTH_CIPHER_WEP40)
{
caps |= (NM_802_11_CAP_PROTO_WEP NM_802_11_CAP_CIPHER_WEP40);
caps = ~NM_802_11_CAP_PROTO_NONE;
}
So if we find a WEPnn cypher we bitwise or in (WEP bitwise and
WEP40) to the capabilities:
#define NM_802_11_CAP_PROTO_WEP0x00
#define NM_802_11_CAP_CIPHER_WEP40 0x10
However, the bitwise and of these two is 0, so we will or in nothing.
This leads to the access point being listed on your menus without
the normal padlock, and no keys are requested or loaded.
I applied the patch below, rebuilt and reinstalled and it appears
to fix things up.
=== 8 ===
commit 0cdd2bc4dc75ca6f14785de998cbd96be396b35e
Author: Andy Whitcroft [EMAIL PROTECTED]
Date: Wed Feb 21 13:53:37 2007 +
fix capability bit handling, fixing WEP Access Points
When we find a WEP enabled access point we will accumulate
its 'capabilities' in add_capabilities_from_cipher(). For
WEP this is handled with the following stanza:
if (cipher IW_AUTH_CIPHER_WEP40)
{
caps |= (NM_802_11_CAP_PROTO_WEP NM_802_11_CAP_CIPHER_WEP40);
caps = ~NM_802_11_CAP_PROTO_NONE;
}
So if we find a WEPnn cypher we bitwise or in (WEP bitwise and
WEP40) to the capabilities:
#define NM_802_11_CAP_PROTO_WEP0x00
#define NM_802_11_CAP_CIPHER_WEP40 0x10
However, the bitwise and of these two is 0, so we will or in nothing.
This leads to the access point being listed on your menus without
the normal padlock, and no keys are requested or loaded.
Change this to bitwise or.
Signed-off-by: Andy Whitcroft [EMAIL PROTECTED]
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index 2f5c027..cc02308 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -572,12 +572,12 @@ static guint32 add_capabilities_from_cipher (guint32
caps, int cipher)
{
if (cipher IW_AUTH_CIPHER_WEP40)
{
- caps |= (NM_802_11_CAP_PROTO_WEP NM_802_11_CAP_CIPHER_WEP40);
+ caps |= (NM_802_11_CAP_PROTO_WEP | NM_802_11_CAP_CIPHER_WEP40);
caps = ~NM_802_11_CAP_PROTO_NONE;
}
if (cipher IW_AUTH_CIPHER_WEP104)
{
- caps |= (NM_802_11_CAP_PROTO_WEP NM_802_11_CAP_CIPHER_WEP104);
+ caps |= (NM_802_11_CAP_PROTO_WEP | NM_802_11_CAP_CIPHER_WEP104);
caps = ~NM_802_11_CAP_PROTO_NONE;
}
if (cipher IW_AUTH_CIPHER_TKIP)
=== 8 ===
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-686
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)
Versions of packages network-manager depends on:
ii adduser 3.102Add and remove users and groups
ii dbus1.0.2-1 simple interprocess messaging syst
ii dhcdbd 2.0-2D-Bus interface to the ISC DHCP cl
ii hal 0.5.8.1-6.1 Hardware Abstraction Layer
ii ifupdown0.6.8high level tools to configure netw
ii iproute 20061002-3 Professional tools to control the
ii iputils-arping 3:20020927-6 Tool to send ICMP echo requests to
ii libc6 2.3.6.ds1-11 GNU C Library: Shared libraries
ii libdbus-1-3 1.0.2-1 simple interprocess messaging syst
ii libdbus-glib-1-20.71-3 simple interprocess messaging syst
ii libgcrypt11 1.2.3-2 LGPL Crypto library - runtime libr
ii libglib2.0-02.12.4-2 The GLib library of C routines
ii libgpg-error0 1.4-1library for common error values an
ii libhal1 0.5.8.1-6.1 Hardware Abstraction Layer - share
ii libiw28 28-1 Wireless tools - library
ii libnl1-pre6 1.0~pre6-2 Library for dealing with netlink s
ii libnm-util0 0.6.4-6 network management framework (shar
ii lsb-base3.1-23 Linux Standard Base 3.1 init scrip
ii wpasupplicant 0.5.5-2 Client support for WPA and WPA2 (I
network-manager recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#666170: Patch for kpathsea API change
We are using the below patch in Ubuntu to handle the kpathsea5 - kpathsea6 transition. Please consider for debian. -apw diff -u ptex-bin-3.1.11+0.04b/debian/rules ptex-bin-3.1.11+0.04b/debian/rules --- ptex-bin-3.1.11+0.04b/debian/rules +++ ptex-bin-3.1.11+0.04b/debian/rules @@ -68,6 +68,12 @@ patch -p0 -d $(TETEX_SRC_DIR)/texk/web2c/$(PTEX_SRC_DIR)/$(JMPOST_SRC_DIR) $$f ; \ done) + # Apply patches to web2c source (should be named as *.patch) + # Put patches in debian/patches/web2c. + (for f in debian/patches/web2c/*.patch ; do \ + patch -p0 -d $(TETEX_SRC_DIR)/texk/web2c/ $$f ; \ + done) + # Copy texmf.cnf from your system. cp /usr/share/texmf/web2c/texmf.cnf \ $(TETEX_SRC_DIR)/texk/web2c/$(PTEX_SRC_DIR)/texmf.cnf.orig diff -u ptex-bin-3.1.11+0.04b/debian/changelog ptex-bin-3.1.11+0.04b/debian/changelog --- ptex-bin-3.1.11+0.04b/debian/changelog +++ ptex-bin-3.1.11+0.04b/debian/changelog @@ -1,3 +1,13 @@ +ptex-bin (3.1.11+0.04b-0.2ubuntu1) quantal; urgency=low + + * Track changes to libkpathsea6 API. + - program_invocation_name - kpse_invocation_name + * Fix link order for -l options on splitup. + * Add support for patches to web2c. + * Sort out now removed kpse_set_prog_name. + + -- Andy Whitcroft a...@ubuntu.com Thu, 21 Jun 2012 16:53:16 +0100 + ptex-bin (3.1.11+0.04b-0.2) unstable; urgency=low * Non-maintainer upload. diff -u ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch --- ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch +++ ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch @@ -6,7 +6,7 @@ -char *program_invocation_name; +#include kpathsea/types.h -+ ++#define program_invocation_name kpse_invocation_name int filenumber = 0, ifdef_nesting = 0, lines_in_file = 0; char *output_name = NULL; boolean has_ini; only in patch2: unchanged: --- ptex-bin-3.1.11+0.04b.orig/debian/patches/pteextra.c-kpse-program-name.patch +++ ptex-bin-3.1.11+0.04b/debian/patches/pteextra.c-kpse-program-name.patch @@ -0,0 +1,11 @@ +--- ptexextra.c-orig 2012-06-22 11:18:23.626189357 -0400 ptexextra.c2012-06-22 11:18:26.586189199 -0400 +@@ -19,6 +19,8 @@ + #include kpathsea/variable.h + #include kpathsea/absolute.h + ++#define program_invocation_name kpse_invocation_name ++ + #include time.h /* For `struct tm'. */ + #if defined (HAVE_SYS_TIME_H) + #include sys/time.h only in patch2: unchanged: --- ptex-bin-3.1.11+0.04b.orig/debian/patches/jmpost/jmpextra-program-invocation-name.patch +++ ptex-bin-3.1.11+0.04b/debian/patches/jmpost/jmpextra-program-invocation-name.patch @@ -0,0 +1,10 @@ +--- jmpextra.c-orig2012-06-23 05:30:06.171064994 -0400 jmpextra.c 2012-06-23 05:33:12.679067745 -0400 +@@ -26,6 +26,7 @@ + #include kpathsea/readable.h + #include kpathsea/variable.h + #include kpathsea/absolute.h ++#define program_invocation_name kpse_invocation_name + + #include time.h /* For `struct tm'. */ + #if defined (HAVE_SYS_TIME_H) only in patch2: unchanged: --- ptex-bin-3.1.11+0.04b.orig/debian/patches/web2c/cpascal.h-kpse_set_program_name.patch +++ ptex-bin-3.1.11+0.04b/debian/patches/web2c/cpascal.h-kpse_set_program_name.patch @@ -0,0 +1,11 @@ +--- cpascal.h-orig 2012-06-22 11:38:30.326205966 -0400 cpascal.h 2012-06-22 11:46:03.626209807 -0400 +@@ -199,7 +199,7 @@ + #define kpsefindtfm kpse_find_tfm + #define kpsefindvfkpse_find_vf + #define kpseinitprog kpse_init_prog +-#define kpsesetprogname kpse_set_progname ++#define kpsesetprogname(x) kpse_set_program_name(x, nil) + #define kpsesetprogramname kpse_set_program_name + #define kpseresetprogramname kpse_reset_program_name + #define kpsegfformat kpse_gf_format only in patch2: unchanged: --- ptex-bin-3.1.11+0.04b.orig/debian/patches/teTeX/splitup-makefile.patch +++ ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup-makefile.patch @@ -0,0 +1,11 @@ +--- texk/web2c/web2c/Makefile.in-orig 2012-06-22 10:56:39.694171478 -0400 texk/web2c/web2c/Makefile.in 2012-06-22 10:56:59.354164389 -0400 +@@ -37,7 +37,7 @@ + fixwrites: fixwrites.o kps.o + $(build_link_command) fixwrites.o kps.o + splitup: splitup.o kps.o +- $(build_link_command) -lkpathsea splitup.o kps.o ++ $(build_link_command) splitup.o kps.o -lkpathsea + regfix: regfix.o kps.o + $(build_link_command) regfix.o kps.o + -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#679883: calibre: Port to libpoppler25 API
Package: calibre
Version: 0.8.51+dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track API changes in libpoppler19 to libpoppler25 transition.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru calibre-0.8.51+dfsg/debian/patches/series calibre-0.8.51+dfsg/debian/patches/series
--- calibre-0.8.51+dfsg/debian/patches/series 2012-05-14 11:13:47.0 +0100
+++ calibre-0.8.51+dfsg/debian/patches/series 2012-06-08 16:13:25.0 +0100
@@ -7,3 +7,4 @@
manpages-installation.patch
disable_plugins.py
use-system-feedparser.patch
+track_libpoppler25_api_changes.patch
diff -Nru calibre-0.8.51+dfsg/debian/patches/track_libpoppler25_api_changes.patch calibre-0.8.51+dfsg/debian/patches/track_libpoppler25_api_changes.patch
--- calibre-0.8.51+dfsg/debian/patches/track_libpoppler25_api_changes.patch 1970-01-01 01:00:00.0 +0100
+++ calibre-0.8.51+dfsg/debian/patches/track_libpoppler25_api_changes.patch 2012-06-08 16:13:25.0 +0100
@@ -0,0 +1,27 @@
+Description: track API changes in popper libraries
+ The popper libraries have updated from libpoppler19 to libpoppler25, track
+ changes to the API.
+
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-08
+
+--- calibre-0.8.51+dfsg.orig/src/calibre/ebooks/pdf/reflow.cpp
calibre-0.8.51+dfsg/src/calibre/ebooks/pdf/reflow.cpp
+@@ -647,7 +647,7 @@ void XMLOutputDev::process_link(AnnotLin
+
+
+ void XMLOutputDev::endPage() {
+-Links *slinks = catalog-getPage(current_page-number())-getLinks(catalog);
++Links *slinks = catalog-getPage(current_page-number())-getLinks();
+ for (int i = 0; i slinks-getNumLinks(); i++)
+ {
+ this-process_link(slinks-getLink(i));
+@@ -878,7 +878,7 @@ vectorchar* Reflow::render_first_page(
+ throw ReflowException(Failed to allocate SplashOutputDev);
+ }
+ try {
+-out-startDoc(doc-getXRef());
++out-startDoc(doc);
+ out-startPage(1, NULL);
+
+ double pg_w, pg_h;
Bug#679884: gambas2: Port to libpoppler25 API
Package: gambas2
Version: 2.23.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track API changes in libpoppler19 to libpoppler25 transition.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gambas2-2.23.1/debian/changelog gambas2-2.23.1/debian/changelog
diff -Nru gambas2-2.23.1/debian/patches/series gambas2-2.23.1/debian/patches/series
--- gambas2-2.23.1/debian/patches/series 2011-12-06 10:12:46.0 +
+++ gambas2-2.23.1/debian/patches/series 2012-06-08 17:36:56.0 +0100
@@ -4,3 +4,4 @@
fixFTBS_kfreeBSD
remove_harcoded_kde.patch
poppler-0.18.patch
+track_libpoppler25_api_changes.patch
diff -Nru gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch
--- gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch 1970-01-01 01:00:00.0 +0100
+++ gambas2-2.23.1/debian/patches/track_libpoppler25_api_changes.patch 2012-06-11 08:36:33.0 +0100
@@ -0,0 +1,74 @@
+Description: track API changes in poppler libraries
+ The poppler libraries have updated from libpoppler19 to libpoppler25, track
+ API changes.
+ .
+ startDoc() now takes a PDFDoc object instead of an XRef
+ findText() now takes an additional Bool which indicates wholeword searches
+ TextOutputDev() now takes an additional fixedPitch which is only used when
+ the preceeding argument is gTrue
+ createGfx() no longer takes a Catalog argument
+ getAnnots() no longer takes a Catalog argument
+ display() no longer takes a Catalog argument nor display selector
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-08
+
+Index: gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp
+===
+--- gambas2-2.23.1.orig/gb.pdf/src/CPdfDocument.cpp 2012-06-11 08:33:06.676871126 +0100
gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp 2012-06-11 08:35:28.481574298 +0100
+@@ -407,7 +407,7 @@
+ white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+ THIS-dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
+
+- THIS-dev-startDoc(THIS-doc-getXRef ());
++ THIS-dev-startDoc(THIS-doc);
+
+ outline=THIS-doc-getOutline();
+ if (outline) THIS-index=outline-getItems();
+@@ -838,8 +838,7 @@
+ gFalse,
+ gTrue,
+ x,y,w,h,
+- gFalse,
+- THIS-doc-getCatalog ());
++ gFalse);
+
+ map=THIS-dev-getBitmap();
+
+@@ -929,9 +928,9 @@
+ w = VARGOPT(W, (int32_t)THIS-page-getMediaWidth());
+ h = VARGOPT(H, (int32_t)THIS-page-getMediaHeight());
+
+- dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
++ dev = new TextOutputDev (NULL, gTrue, gFalse, 0, gFalse);
+ gfx = THIS-page-createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
+-gFalse,THIS-doc-getCatalog (),NULL, NULL, NULL, NULL);
++gFalse,NULL, NULL);
+
+ THIS-page-display(gfx);
+ dev-endPage();
+@@ -961,7 +960,7 @@
+ {
+ Object obj;
+
+- THIS-links = new Links (THIS-page-getAnnots (THIS-doc-getCatalog()));
++ THIS-links = new Links (THIS-page-getAnnots ());
+ obj.free();
+ }
+
+@@ -1195,12 +1194,12 @@
+
+ if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
+
+- textdev = new TextOutputDev (NULL, true, false, false);
+- THIS-page-display (textdev, 72, 72, 0, false, false, false, THIS-doc-getCatalog());
++ textdev = new TextOutputDev (NULL, true, false, 0, false);
++ THIS-page-display (textdev, 72, 72, 0, false, false, false);
+
+ if (THIS-Found) { GB.FreeArray(POINTER(THIS-Found)); THIS-Found=NULL; }
+
+- while (textdev-findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,x0,y0,x1,y1))
++ while (textdev-findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,x0,y0,x1,y1))
+ {
+ if (!THIS-Found) {
+ GB.NewArray(POINTER(THIS-Found),sizeof(FoundRect),1);
Bug#679885: gambas3: Port to libpoppler25 API
Package: gambas3
Version: 3.1.1-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to libpoppler25 API.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gambas3-3.1.1/debian/patches/series gambas3-3.1.1/debian/patches/series
--- gambas3-3.1.1/debian/patches/series 2012-05-24 12:00:02.0 +0100
+++ gambas3-3.1.1/debian/patches/series 2012-06-20 10:49:18.0 +0100
@@ -1,2 +1,3 @@
detect_browser_debian
dont_compile_examples
+track_libpoppler25_api
diff -Nru gambas3-3.1.1/debian/patches/track_libpoppler25_api gambas3-3.1.1/debian/patches/track_libpoppler25_api
--- gambas3-3.1.1/debian/patches/track_libpoppler25_api 1970-01-01 01:00:00.0 +0100
+++ gambas3-3.1.1/debian/patches/track_libpoppler25_api 2012-06-20 13:09:05.0 +0100
@@ -0,0 +1,136 @@
+Description: track changes to libpoppler25 API
+ Track changes to libpoppler25 API:
+ .
+ startDoc now takes a PDFDoc rather than its XRef.
+ displaySlice no longer takes a Catalog argument.
+ TextOutputDev now takes a fixedPitch argument (0 for previous behavior).
+ createGfx no longer takes a Catalog nor (unused) annotation
+ callback descriminator.
+ getAnnots no longer takes a Catalog argument.
+ .
+ Also adds configure support for poppler version 20 (API version 25)
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-20
+Index: gambas3-3.1.1/gb.pdf/src/CPdfDocument.cpp
+===
+--- gambas3-3.1.1.orig/gb.pdf/src/CPdfDocument.cpp 2012-06-20 12:13:11.670036741 +0100
gambas3-3.1.1/gb.pdf/src/CPdfDocument.cpp 2012-06-20 12:54:39.618373811 +0100
+@@ -450,7 +450,13 @@
+ white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+ THIS-dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
+
+- THIS-dev-startDoc(THIS-doc-getXRef ());
++ THIS-dev-startDoc(
++#ifdef POPPLER_VERSION_0_20
++ THIS-doc
++#else
++ THIS-doc-getXref ()
++#endif
++ );
+
+ outline=THIS-doc-getOutline();
+ if (outline) THIS-index=outline-getItems();
+@@ -880,8 +886,11 @@
+ gFalse,
+ gTrue,
+ x,y,w,h,
+- gFalse,
+- THIS-doc-getCatalog ());
++ gFalse
++#ifndef POPPLER_VERSION_0_20
++ , THIS-doc-getCatalog ()
++#endif
++ );
+
+ map=THIS-dev-getBitmap();
+
+@@ -940,8 +949,20 @@
+ w = VARGOPT(W, (int32_t)THIS-page-getMediaWidth());
+ h = VARGOPT(H, (int32_t)THIS-page-getMediaHeight());
+
+- dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
+- gfx = THIS-page-createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS-doc-getCatalog (),NULL, NULL, NULL, NULL);
++ dev = new TextOutputDev (NULL, gTrue,
++#ifdef POPPLER_VERSION_0_20
++ 0,
++#endif
++ gFalse, gFalse);
++ gfx = THIS-page-createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse
++#ifndef POPPLER_VERSION_0_20
++, THIS-doc-getCatalog ()
++#endif
++, NULL, NULL
++#ifndef POPPLER_VERSION_0_20
++, NULL, NULL
++#endif
++ );
+
+ THIS-page-display(gfx);
+ dev-endPage();
+@@ -970,7 +991,9 @@
+
+ void aux_fill_links(void *_object)
+ {
+- #if POPPLER_VERSION_0_17
++ #if POPPLER_VERSION_0_20
++ THIS-links = new Links (THIS-page-getAnnots ());
++ #elif POPPLER_VERSION_0_17
+ THIS-links = new Links (THIS-page-getAnnots (THIS-doc-getCatalog()));
+ #else
+ Object obj;
+@@ -1152,13 +1175,25 @@
+
+ if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
+
+- textdev = new TextOutputDev (NULL, true, false, false);
+- THIS-page-display (textdev, 72, 72, 0, false, false, false, THIS-doc-getCatalog());
++ textdev = new TextOutputDev (NULL, true,
++#ifdef POPPLER_VERSION_0_20
++ 0,
++#endif
++ false, false);
++ THIS-page-display (textdev, 72, 72, 0, false, false, false
++#ifndef POPPLER_VERSION_0_20
++ , THIS-doc-getCatalog()
++#endif
++);
+
+ if (THIS-Found) { GB.FreeArray(POINTER(THIS-Found)); THIS-Found=NULL; }
+
+ count = 0;
+- while (textdev-findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,x0,y0,x1,y1))
++ while (textdev-findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,
++#ifdef POPPLER_VERSION_0_20
++ gFalse,
++#endif
++ x0,y0,x1,y1))
+ {
+ if (!THIS-Found)
+ GB.NewArray(POINTER(THIS-Found
Bug#679887: gdal: Port to libpoppler25 API
Package: gdal
Version: 1.9.0-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to libpoppler25 API.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gdal-1.9.0/debian/patches/series gdal-1.9.0/debian/patches/series
--- gdal-1.9.0/debian/patches/series 2012-06-05 13:29:19.0 +0100
+++ gdal-1.9.0/debian/patches/series 2012-06-13 16:49:30.0 +0100
@@ -9,3 +9,4 @@
mrsid-plugin
symver
spatialite
+track_libpoppler25_abi_changes
diff -Nru gdal-1.9.0/debian/patches/track_libpoppler25_abi_changes gdal-1.9.0/debian/patches/track_libpoppler25_abi_changes
--- gdal-1.9.0/debian/patches/track_libpoppler25_abi_changes 1970-01-01 01:00:00.0 +0100
+++ gdal-1.9.0/debian/patches/track_libpoppler25_abi_changes 2012-06-13 17:15:08.0 +0100
@@ -0,0 +1,46 @@
+Description: Track changes to libpoppler25 API
+ Track changes to libpoppler 25 ABI.
+ .
+ startDoc now takes a PDFDoc rather than its Xref.
+ setErrorFunction - setErrorCallback.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-13
+Index: gdal-1.9.0/frmts/pdf/pdfdataset.cpp
+===
+--- gdal-1.9.0.orig/frmts/pdf/pdfdataset.cpp 2012-02-20 09:48:39.0 +
gdal-1.9.0/frmts/pdf/pdfdataset.cpp 2012-06-13 17:14:21.967465186 +0100
+@@ -330,7 +330,7 @@
+ SplashOutputDev *poSplashOut;
+ poSplashOut = new SplashOutputDev(splashModeRGB8, 4, gFalse, sColor);
+ PDFDoc* poDoc = poGDS-poDoc;
+-poSplashOut-startDoc(poDoc-getXRef());
++poSplashOut-startDoc(poDoc);
+ double dfDPI = poGDS-dfDPI;
+
+ /* EVIL: we modify a private member... */
+@@ -521,13 +521,14 @@
+ //
+
+ #ifdef USE_POPPLER
+-static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args)
++static void PDFDatasetErrorCallback( void *data, ErrorCategory category,
++ int nPos, char *msg )
+ {
+ CPLString osError;
+
+ if (nPos = 0)
+ osError.Printf(Pos = %d, , nPos);
+-osError += CPLString().vPrintf(pszMsg, args);
++osError += CPLString().Printf(%s, msg);
+
+ if (strcmp(osError.c_str(), Incorrect password) == 0)
+ return;
+@@ -570,7 +571,7 @@
+ GooString* poUserPwd = NULL;
+
+ /* Set custom error handler for poppler errors */
+-setErrorFunction(PDFDatasetErrorFunction);
++setErrorCallback(PDFDatasetErrorCallback, NULL);
+
+ PDFDoc* poDoc = NULL;
+ ObjectAutoFree oObj;
Bug#679888: gnome-commander: Port to libpoppler25 API
Package: gnome-commander
Version: 1.2.8.15-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to libpoppler25 API.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnome-commander-1.2.8.15/debian/patches/series gnome-commander-1.2.8.15/debian/patches/series
--- gnome-commander-1.2.8.15/debian/patches/series 2012-05-13 23:26:36.0 +0100
+++ gnome-commander-1.2.8.15/debian/patches/series 2012-06-13 16:01:51.0 +0100
@@ -3,3 +3,4 @@
0002-strrchr_instead_of_g_strrstr.patch
0003-g_ascii_strcasecmp_instead_of_g_strcasecmp.patch
werror-format-security.diff
+track_libpoppler25_abi_changes
diff -Nru gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes
--- gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes 1970-01-01 01:00:00.0 +0100
+++ gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes 2012-06-13 16:01:51.0 +0100
@@ -0,0 +1,28 @@
+Description: track libpoppler25 API changes
+ Track changes to the libpoppler25 API.
+ .
+ setErrorFunction - setErrorCallback -- interface replaced
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-13
+Index: gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc
+===
+--- gnome-commander-1.2.8.15.orig/src/tags/gnome-cmd-tags-poppler.cc 2011-12-06 19:10:29.0 +
gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2012-06-13 15:43:29.648428595 +0100
+@@ -41,7 +41,7 @@
+ static regex_t rxDate;
+ static gboolean rxDate_OK;
+
+-static void noErrorReporting(int pos, char *msg, va_list args)
++static void noErrorReporting(void *data, ErrorCategory category, int pos, char *msg)
+ {
+ }
+ #endif
+@@ -52,7 +52,7 @@
+ #ifdef HAVE_PDF
+ rxDate_OK = regcomp (rxDate, ^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?), REG_EXTENDED)==0;
+
+-setErrorFunction(noErrorReporting);
++setErrorCallback(noErrorReporting, NULL);
+ #endif
+ }
+
Bug#679890: inkscape: Port to libpoppler25 API
Package: inkscape
Version: 0.48.3.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Follow ABI changes for libpoppler25 (poppler 0.20.0-0ubuntu1).
(LP: #1005565)
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u inkscape-0.48.3.1/debian/changelog inkscape-0.48.3.1/debian/changelog
diff -u inkscape-0.48.3.1/debian/patches/series inkscape-0.48.3.1/debian/patches/series
--- inkscape-0.48.3.1/debian/patches/series
+++ inkscape-0.48.3.1/debian/patches/series
@@ -3,0 +4,2 @@
+03_track_libpoppler25_abi_changes.patch
+04_track_libpoppler25_abi_changes_colorspace.patch
only in patch2:
unchanged:
--- inkscape-0.48.3.1.orig/debian/patches/03_track_libpoppler25_abi_changes.patch
+++ inkscape-0.48.3.1/debian/patches/03_track_libpoppler25_abi_changes.patch
@@ -0,0 +1,438 @@
+Description: follow changes to libpoppler25 API
+ Following change to the libpoppler25 API:
+ .
+ error() now takes an additional ErrorCategory arguement.
+ getOrigName() is now gone getName() returns the original name now.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-11
+Index: inkscape-0.48.3.1/src/extension/internal/pdfinput/pdf-parser.cpp
+===
+--- inkscape-0.48.3.1.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2012-06-11 11:39:28.108316853 +0100
inkscape-0.48.3.1/src/extension/internal/pdfinput/pdf-parser.cpp 2012-06-11 11:59:56.558408413 +0100
+@@ -367,14 +367,14 @@
+ for (i = 0; i obj-arrayGetLength(); ++i) {
+ obj-arrayGet(i, obj2);
+ if (!obj2.isStream()) {
+- error(-1, const_castchar*(Weird page contents));
++ error(errUnimplemented, -1, const_castchar*(Weird page contents));
+ obj2.free();
+ return;
+ }
+ obj2.free();
+ }
+ } else if (!obj-isStream()) {
+-error(-1, const_castchar*(Weird page contents));
++error(errUnimplemented, -1, const_castchar*(Weird page contents));
+ return;
+ }
+ parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+@@ -419,7 +419,7 @@
+
+ // too many arguments - something is wrong
+ } else {
+- error(getPos(), const_castchar*(Too many args in content stream));
++ error(errSyntaxError, getPos(), const_castchar*(Too many args in content stream));
+ if (printCommands) {
+ printf(throwing away arg: );
+ obj.print(stdout);
+@@ -436,7 +436,7 @@
+
+ // args at end with no command
+ if (numArgs 0) {
+-error(getPos(), const_castchar*(Leftover args in content stream));
++error(errSyntaxError, getPos(), const_castchar*(Leftover args in content stream));
+ if (printCommands) {
+ printf(%d leftovers:, numArgs);
+ for (i = 0; i numArgs; ++i) {
+@@ -502,7 +502,7 @@
+ name = cmd-getCmd();
+ if (!(op = findOp(name))) {
+ if (ignoreUndef == 0)
+- error(getPos(), const_castchar*(Unknown operator '%s'), name);
++ error(errSyntaxError, getPos(), const_castchar*(Unknown operator '%s'), name);
+ return;
+ }
+
+@@ -510,7 +510,7 @@
+ argPtr = args;
+ if (op-numArgs = 0) {
+ if (numArgs op-numArgs) {
+- error(getPos(), const_castchar*(Too few (%d) args to '%s' operator), numArgs, name);
++ error(errSyntaxError, getPos(), const_castchar*(Too few (%d) args to '%s' operator), numArgs, name);
+ return;
+ }
+ if (numArgs op-numArgs) {
+@@ -522,14 +522,14 @@
+ }
+ } else {
+ if (numArgs -op-numArgs) {
+- error(getPos(), const_castchar*(Too many (%d) args to '%s' operator),
++ error(errSyntaxError, getPos(), const_castchar*(Too many (%d) args to '%s' operator),
+ numArgs, name);
+ return;
+ }
+ }
+ for (i = 0; i numArgs; ++i) {
+ if (!checkArg(argPtr[i], op-tchk[i])) {
+- error(getPos(), const_castchar*(Arg #%d to '%s' operator is wrong type (%s)),
++ error(errSyntaxError, getPos(), const_castchar*(Arg #%d to '%s' operator is wrong type (%s)),
+ i, name, argPtr[i].getTypeName());
+ return;
+ }
+@@ -690,7 +690,7 @@
+ return;
+ }
+ if (!obj1.isDict()) {
+-error(getPos(), const_castchar*(ExtGState '%s' is wrong type), args[0].getName());
++error(errSyntaxError, getPos(), const_castchar*(ExtGState '%s' is wrong type), args[0].getName());
+ obj1.free();
+ return;
+ }
+@@ -705,7 +705,7 @@
+ if (state-parseBlendMode(obj2, mode)) {
+ state-setBlendMode(mode);
+ } else
Bug#679891: pdf2djvu: Port to libpoppler25 API
Package: pdf2djvu
Version: 0.7.12-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to libpoppler25 API.
* Disable tests/test-nfkc.sh which tests ligature handling
but libpoppler25 now always decomposes such ligatures.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pdf2djvu-0.7.12/debian/patches/series pdf2djvu-0.7.12/debian/patches/series
--- pdf2djvu-0.7.12/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ pdf2djvu-0.7.12/debian/patches/series 2012-06-14 20:49:01.0 +0100
@@ -0,0 +1,2 @@
+track_libpoppler25_api.patch
+track_libpoppler23_api_disable_tests.patch
diff -Nru pdf2djvu-0.7.12/debian/patches/track_libpoppler23_api_disable_tests.patch pdf2djvu-0.7.12/debian/patches/track_libpoppler23_api_disable_tests.patch
--- pdf2djvu-0.7.12/debian/patches/track_libpoppler23_api_disable_tests.patch 1970-01-01 01:00:00.0 +0100
+++ pdf2djvu-0.7.12/debian/patches/track_libpoppler23_api_disable_tests.patch 2012-06-14 20:51:53.0 +0100
@@ -0,0 +1,19 @@
+Description: Track libpoppler25 API changes -- disable broken tests
+ Disable tests/test-nfkc.sh which tests ligature handling
+ but libpoppler25 now always decomposes such ligatures.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-14
+Index: pdf2djvu-0.7.12/tests/test-nfkc.sh
+===
+--- pdf2djvu-0.7.12.orig/tests/test-nfkc.sh 2012-06-14 20:49:18.147169287 +0100
pdf2djvu-0.7.12/tests/test-nfkc.sh 2012-06-14 20:49:32.683241358 +0100
+@@ -8,6 +8,9 @@
+
+ . ./common.sh
+
++echo $0: DISABLED -- libpoppler25 always expands ligatures
++exit 0
++
+ test_pdf2djvu
+ djvused -e print-pure-txt $djvu_file | grep '^fluorografia *$' /dev/null
+ test_pdf2djvu --no-nfkc
diff -Nru pdf2djvu-0.7.12/debian/patches/track_libpoppler25_api.patch pdf2djvu-0.7.12/debian/patches/track_libpoppler25_api.patch
--- pdf2djvu-0.7.12/debian/patches/track_libpoppler25_api.patch 1970-01-01 01:00:00.0 +0100
+++ pdf2djvu-0.7.12/debian/patches/track_libpoppler25_api.patch 2012-06-14 20:51:59.0 +0100
@@ -0,0 +1,129 @@
+Description: Track libpoppler25 API changes
+ Track changes to libpoppler25 API:
+ .
+ startDoc now takes a PDFDoc not its XRef.
+ processLink no longer takes a Catalog as argument.
+ setErrorFunction - setErrorCallback conversion.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-14
+Index: pdf2djvu-0.7.12/pdf-backend.hh
+===
+--- pdf2djvu-0.7.12.orig/pdf-backend.hh 2012-01-21 23:16:50.0 +
pdf2djvu-0.7.12/pdf-backend.hh 2012-06-14 17:09:54.717895364 +0100
+@@ -115,13 +115,13 @@
+ pdf::splash::OutputDevice(monochrome ? splashModeMono1 : splashModeRGB8, 4, gFalse, paper_color)
+ { }
+
+-void processLink(pdf::link::Link *link, pdf::Catalog *catalog)
++void processLink(pdf::link::Link *link)
+ {
+- this-drawLink(link, catalog);
++ this-drawLink(link);
+ }
+
+-virtual void drawLink(pdf::link::Link *link, pdf::Catalog *catalog);
+-virtual void drawLink(pdf::link::Link *link, const std::string border_color, pdf::Catalog *catalog) { }
++virtual void drawLink(pdf::link::Link *link);
++virtual void drawLink(pdf::link::Link *link, const std::string border_color) { }
+ std::vectorstd::string link_border_colors;
+ protected:
+ static void convert_path(gfx::State *state, pdf::splash::Path splash_path);
+Index: pdf2djvu-0.7.12/pdf-backend.cc
+===
+--- pdf2djvu-0.7.12.orig/pdf-backend.cc 2012-01-21 23:16:50.0 +
pdf2djvu-0.7.12/pdf-backend.cc 2012-06-14 17:17:47.536239955 +0100
+@@ -32,11 +32,10 @@
+ * ==
+ */
+
+-static void poppler_error_handler(int pos, char *message, va_list args)
++static void poppler_error_handler (void *data, ErrorCategory category,
++ int pos, char *msg)
+ {
+- std::string format;
+- std::string expanded_message = string_vprintf(message, args);
+- const char *c_message = expanded_message.c_str();
++ const char *c_message = msg;
+ if (pos = 0)
+ {
+ error_log
+@@ -61,7 +60,7 @@
+ Cwd cwd(argv0_dir_name);
+ #endif
+ globalParams = new GlobalParams();
+- setErrorFunction(poppler_error_handler);
++ setErrorCallback(poppler_error_handler
Bug#679892: pdftoipe: Port to libpoppler25 API
Package: pdftoipe
Version: 20110916-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to libpoppler25 API.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru pdftoipe-20110916/debian/changelog pdftoipe-20110916/debian/changelog
diff -Nru pdftoipe-20110916/debian/control pdftoipe-20110916/debian/control
--- pdftoipe-20110916/debian/control 2012-02-24 03:20:35.0 +
+++ pdftoipe-20110916/debian/control 2012-06-15 10:34:47.0 +0100
@@ -2,7 +2,8 @@
Homepage: http://ipe7.sourceforge.net/
Section: graphics
Priority: optional
-Maintainer: Steve M. Robbins s...@debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Steve M. Robbins s...@debian.org
Build-Depends: debhelper (= 8), pkg-config, libpoppler-private-dev
Standards-Version: 3.9.2
diff -Nru pdftoipe-20110916/debian/patches/series pdftoipe-20110916/debian/patches/series
--- pdftoipe-20110916/debian/patches/series 2011-12-11 15:17:48.0 +
+++ pdftoipe-20110916/debian/patches/series 2012-06-15 10:28:21.0 +0100
@@ -1 +1,2 @@
poppler.patch
+track_libpoppler25_api.patch
diff -Nru pdftoipe-20110916/debian/patches/track_libpoppler25_api.patch pdftoipe-20110916/debian/patches/track_libpoppler25_api.patch
--- pdftoipe-20110916/debian/patches/track_libpoppler25_api.patch 1970-01-01 01:00:00.0 +0100
+++ pdftoipe-20110916/debian/patches/track_libpoppler25_api.patch 2012-06-15 10:38:17.0 +0100
@@ -0,0 +1,19 @@
+Description: Track libpoppler25 API changes
+ Track changes to the libpoppler25 API:
+ .
+ error() now takes an additional ErrorCategory argument.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-15
+Index: pdftoipe-20110916/xmloutputdev.cpp
+===
+--- pdftoipe-20110916.orig/xmloutputdev.cpp 2012-06-15 10:12:14.0 +0100
pdftoipe-20110916/xmloutputdev.cpp 2012-06-15 10:31:49.752795033 +0100
+@@ -30,7 +30,7 @@
+ FILE *f;
+
+ if (!(f = fopen(fileName, wb))) {
+-error(-1, Couldn't open output file '%s', fileName);
++error(errCommandLine, -1, Couldn't open output file '%s', fileName);
+ ok = gFalse;
+ return;
+ }
Bug#679893: popplerkit.framework: Port to libpoppler25 API
Package: popplerkit.framework
Version: 0.0.20051227svn-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track changes to poppler20 (libpoppler25) API.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru popplerkit.framework-0.0.20051227svn/debian/patches/poppler20.patch popplerkit.framework-0.0.20051227svn/debian/patches/poppler20.patch
--- popplerkit.framework-0.0.20051227svn/debian/patches/poppler20.patch 1970-01-01 01:00:00.0 +0100
+++ popplerkit.framework-0.0.20051227svn/debian/patches/poppler20.patch 2012-06-14 14:04:10.0 +0100
@@ -0,0 +1,117 @@
+Description: Track poppler20 (libpoppler25) API changes
+ Track poppler20 (libpoppler25) API changes:
+ .
+ Add version 0.20 detection to config.sh
+ startDoc now takes a PDFDoc not its XRef
+ findText no longer takes a Catalog argument
+ TextOutputDev now takes a wholeWord argument
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2012-06-14
+Index: popplerkit.framework-0.0.20051227svn/bindings/poppler_splash_renderer.cc
+===
+--- popplerkit.framework-0.0.20051227svn.orig/bindings/poppler_splash_renderer.cc 2012-06-14 09:51:53.0 +0100
popplerkit.framework-0.0.20051227svn/bindings/poppler_splash_renderer.cc 2012-06-14 12:33:45.427732692 +0100
+@@ -57,7 +57,13 @@
+ return;
+}
+
+- SYNCHRONIZED(SPLASH_DEV(output_dev)-startDoc(PDF_DOC(poppler_document)-getXRef()));
++ SYNCHRONIZED(SPLASH_DEV(output_dev)-startDoc(
++#ifdef POPPLER_0_20
++ PDF_DOC(poppler_document)
++#else
++ PDF_DOC(poppler_document)-XRef
++#endif
++ ));
+ }
+
+ void poppler_splash_device_destroy(void* output_dev)
+@@ -94,9 +100,12 @@
+ #ifdef POPPLER_0_6
+ gFalse, // printing
+ #else
+- NULL, // Links
++ NULL // Links
++#endif
++#ifndef POPPLER_0_20
++ , PDF_DOC(poppler_document)-getCatalog()
+ #endif
+- PDF_DOC(poppler_document)-getCatalog()));
++ ));
+
+return 1;
+ }
+Index: popplerkit.framework-0.0.20051227svn/config.sh
+===
+--- popplerkit.framework-0.0.20051227svn.orig/config.sh 2012-06-14 09:51:53.0 +0100
popplerkit.framework-0.0.20051227svn/config.sh 2012-06-14 10:04:27.775314094 +0100
+@@ -64,6 +64,11 @@
+ POPPLER_VERSION=POPPLER_0_6
+ fi
+
++${PKG_CONFIG} --atleast-version=0.20.0 poppler
++if [ $? -eq 0 ]; then
++ POPPLER_VERSION=POPPLER_0_20
++fi
++
+ echo $POPPLER_VERSION
+
+ # include freetype, just to be sure
+Index: popplerkit.framework-0.0.20051227svn/bindings/GNUmakefile
+===
+--- popplerkit.framework-0.0.20051227svn.orig/bindings/GNUmakefile 2012-06-14 09:51:53.0 +0100
popplerkit.framework-0.0.20051227svn/bindings/GNUmakefile 2012-06-14 10:39:42.001797975 +0100
+@@ -53,4 +53,8 @@
+bindings_CCFLAGS += -DPOPPLER_0_6
+ endif
+
++ifeq ($(POPPLER_0_20), YES)
++ bindings_CCFLAGS += -DPOPPLER_0_20
++endif
++
+ include $(GNUSTEP_MAKEFILES)/subproject.make
+Index: popplerkit.framework-0.0.20051227svn/bindings/poppler_text.cc
+===
+--- popplerkit.framework-0.0.20051227svn.orig/bindings/poppler_text.cc 2012-06-14 09:51:53.0 +0100
popplerkit.framework-0.0.20051227svn/bindings/poppler_text.cc 2012-06-14 14:02:06.922021381 +0100
+@@ -29,7 +29,11 @@
+ void* poppler_text_device_create(int use_phys_layout, int use_raw_text_order, int append)
+ {
+BEGIN_SYNCHRONIZED;
+- void* textDevice = new TextOutputDev(NULL, use_phys_layout, use_raw_text_order, append);
++ void* textDevice = new TextOutputDev(NULL, use_phys_layout,
++#ifdef POPPLER_0_20
++ 0,
++#endif
++ use_raw_text_order, append);
+END_SYNCHRONIZED;
+
+return textDevice;
+@@ -56,11 +60,14 @@
+ #endif
+ crop,
+ #ifdef POPPLER_0_6
+-gFalse, // printing
++gFalse // printing
+ #else
+-NULL, // links
++NULL // links
++#endif
++#ifndef POPPLER_0_20
++,PDF_DOC(poppler_document)-getCatalog()
+ #endif
+-PDF_DOC(poppler_document
Bug#679895: texlive-bin: Port to libpoppler25 API
Package: texlive-bin
Version: 2012.20120530-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Track API changes in libpoppler19 to libpoppler25 transition.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru texlive-bin-2012.20120530/debian/quilt/series texlive-bin-2012.20120530/debian/quilt/series
--- texlive-bin-2012.20120530/debian/quilt/series 2012-05-30 03:01:24.0 +0100
+++ texlive-bin-2012.20120530/debian/quilt/series 2012-06-08 18:17:21.0 +0100
@@ -18,3 +18,4 @@
pmpost-20120415-tl11.diff
pmpost-svg-20120119-tl11.diff
#xdvi-zoom-with-eps-figures.patch
+track_libpoppler25_api_changes.patch
diff -Nru texlive-bin-2012.20120530/debian/quilt/track_libpoppler25_api_changes.patch texlive-bin-2012.20120530/debian/quilt/track_libpoppler25_api_changes.patch
--- texlive-bin-2012.20120530/debian/quilt/track_libpoppler25_api_changes.patch 1970-01-01 01:00:00.0 +0100
+++ texlive-bin-2012.20120530/debian/quilt/track_libpoppler25_api_changes.patch 2012-06-08 18:17:21.0 +0100
@@ -0,0 +1,19 @@
+Description: track API changes in poppler libraries
+ The poppler libraries have updated from libpoppler19 to libpoppler25, track
+ API changes.
+Author: Andy Whitcroft a...@canonical.com
+Last-Update: 2012-06-08
+
+Index: texlive-bin-2012.20120530/texk/web2c/pdftexdir/pdftosrc.cc
+===
+--- texlive-bin-2012.20120530.orig/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-08 16:54:37.0 +0100
texlive-bin-2012.20120530/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-08 16:54:37.0 +0100
+@@ -134,7 +134,7 @@
+ exit(1);
+ }
+ if (extract_xref_table) {
+-int size = xref-getSize();
++int size = xref-getNumObjects();
+ int i;
+ for (i = 0; i size; i++) {
+ if (xref-getEntry(i)-offset == 0x)
Bug#679896: xpdf: Port to libpoppler25 API
Package: xpdf
Version: 3.03-9
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
We are using this patch in Ubuntu to handle the changes in libpoppler's
API version 19 to version 25/26. Please consider for Debian.
* Follow changes to libpoppler25 ABI.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru xpdf-3.03/debian/changelog xpdf-3.03/debian/changelog
diff -Nru xpdf-3.03/debian/patches/check-system-calls.patch xpdf-3.03/debian/patches/check-system-calls.patch
--- xpdf-3.03/debian/patches/check-system-calls.patch 2012-02-25 01:22:51.0 +
+++ xpdf-3.03/debian/patches/check-system-calls.patch 2012-06-12 18:54:08.0 +0100
@@ -19,7 +19,7 @@
- system(fileName-getCString());
+ errcode = system(fileName-getCString());
+if (errcode != 0) {
-+ error( -1 , non-zero error code returned by system call);
++ error(errInternal, -1 , non-zero error code returned by system call);
+}
} else {
msg = new GString(About to execute the command:\n);
@@ -28,7 +28,7 @@
- system(fileName-getCString());
+ errcode = system(fileName-getCString());
+ if (errcode != 0) {
-+error( -1 , non-zero error code returned by system call);
++error(errInternal, -1 , non-zero error code returned by system call);
+ }
}
delete msg;
@@ -48,7 +48,7 @@
- system(cmd-getCString());
+ errcode = system(cmd-getCString());
+ if (errcode != 0) {
-+ error( -1 , non-zero error code returned by system call);
++ error(errInternal, -1 , non-zero error code returned by system call);
+ }
delete cmd;
}
@@ -72,7 +72,7 @@
- system(cmd-getCString());
+ errcode = system(cmd-getCString());
+ if (errcode != 0) {
-+ error( -1, non-zero error code return by system call);
++ error(errInternal, -1, non-zero error code return by system call);
+ }
delete cmd;
}
diff -Nru xpdf-3.03/debian/patches/series xpdf-3.03/debian/patches/series
--- xpdf-3.03/debian/patches/series 2012-02-25 01:35:11.0 +
+++ xpdf-3.03/debian/patches/series 2012-06-12 18:54:08.0 +0100
@@ -23,3 +23,4 @@
fix-invalid-conversions.patch
check-system-calls.patch
fix-pointer-casting.patch
+track_libpopper25_api_changes.patch
diff -Nru xpdf-3.03/debian/patches/track_libpopper25_api_changes.patch xpdf-3.03/debian/patches/track_libpopper25_api_changes.patch
--- xpdf-3.03/debian/patches/track_libpopper25_api_changes.patch 1970-01-01 01:00:00.0 +0100
+++ xpdf-3.03/debian/patches/track_libpopper25_api_changes.patch 2012-06-12 18:54:08.0 +0100
@@ -0,0 +1,121 @@
+Description: track changes to libpoppler25 API
+ Track changes to the libpoppler25 ABI
+ .
+ startDoc now takes a PDFDoc rather than and XRef
+ TextOutputDev::TextOutputDev has an additional fixedPitch parameter, 0
+ triggering previous behaviour.
+ TextOutputDev::findText has an additions wholeWord parameter
+ PSOutputDev::PSOutputDev no longer takes Xref or Catalog parameters
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Updated: 2012-06-12
+Index: xpdf-3.03/xpdf/PDFCore.cc
+===
+--- xpdf-3.03.orig/xpdf/PDFCore.cc 2012-06-11 19:46:42.0 +0100
xpdf-3.03/xpdf/PDFCore.cc 2012-06-12 09:26:58.919206959 +0100
+@@ -196,7 +196,7 @@
+ }
+ doc = newDoc;
+ if (out) {
+-out-startDoc(doc-getXRef());
++out-startDoc(newDoc);
+ }
+
+ // nothing displayed yet
+@@ -901,7 +901,7 @@
+ page-links = doc-getLinks(page-page);
+ }
+ if (!page-text) {
+-if ((textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse))) {
++if ((textOut = new TextOutputDev(NULL, gTrue, 0, gFalse, gFalse))) {
+ doc-displayPage(textOut, page-page, dpi, dpi, rotate,
+ gFalse, gTrue, gFalse);
+ page-text = textOut-takeText();
+@@ -1661,7 +1661,7 @@
+ }
+ s = page-text-getText(x0, y0, x1, y1);
+ } else {
+-textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse);
++textOut = new TextOutputDev(NULL, gTrue, 0, gFalse, gFalse);
+ if (textOut-isOk()) {
+ doc-displayPage(textOut, pg, dpi, dpi, rotate, gFalse, gTrue, gFalse);
+ textOut-cvtUserToDev(xMin, yMin, x0, y0);
+@@ -1741,7 +1741,7 @@
+ page = findPage(pg);
+ }
+ if (page-text-findText(u, len, startAtTop, gTrue, startAtLast, gFalse,
+- caseSensitive, backward,
++ caseSensitive, backward, gFalse,
+ xMin, yMin, xMax, yMax)) {
+ goto found;
+ }
+@@ -1749,7 +1749,7 @@
+ if (!onePageOnly
Bug#679891: pdf2djvu: Port to libpoppler25 API
On Mon, Jul 02, 2012 at 11:56:56AM +0200, Jakub Wilk wrote: tags 679891 + fixed-upstream thanks * Andy Whitcroft a...@canonical.com, 2012-07-02, 10:37: * Disable tests/test-nfkc.sh which tests ligature handling but libpoppler25 now always decomposes such ligatures. Well, this test shows that pdf2djvu with your patch doesn't work like it's should⦠The issue is that the semantics of the underlying library has changed. The call used no longer returns ligatures they are always decomposed in libpoppler before being returned. This is a deliberate change in the libpoppler code, new code introduced to ensure that ligatures are not exposed. The new functionality did not appear to be optional. -apw -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#679891: pdf2djvu: Port to libpoppler25 API
On Mon, Jul 02, 2012 at 05:14:34PM +0100, Andy Whitcroft wrote:
On Mon, Jul 02, 2012 at 11:56:56AM +0200, Jakub Wilk wrote:
tags 679891 + fixed-upstream
thanks
* Andy Whitcroft a...@canonical.com, 2012-07-02, 10:37:
* Disable tests/test-nfkc.sh which tests ligature handling but
libpoppler25 now always decomposes such ligatures.
Well, this test shows that pdf2djvu with your patch doesn't work
like it's shouldâ¦
The issue is that the semantics of the underlying library has changed.
The call used no longer returns ligatures they are always decomposed in
libpoppler before being returned. This is a deliberate change in the
libpoppler code, new code introduced to ensure that ligatures are not
exposed. The new functionality did not appear to be optional.
To be specific this is the code delta in poppler which triggers the test
to fail. As the test is specifically seeing if the pdf2djvu ligature
removal is working by confirming that the output changes when it removes
ligatures it is going to fail:
@@ -852,6 +1253,17 @@
// construct the char code - Unicode mapping object
ctu = CharCodeToUnicode::make8BitToUnicode(toUnicode);
+ // pass 1a: Expand ligatures in the Alphabetic Presentation Form
+ // block (eg fi, ffi) to normal form
+ for (code = 0; code 256; ++code) {
+if (unicodeIsAlphabeticPresentationForm(toUnicode[code])) {
+ Unicode *normalized = unicodeNormalizeNFKC(toUnicode[code], 1,
len, NULL);
+ if (len 1)
+ctu-setMapping((CharCode)code, normalized, len);
+ gfree(normalized);
+}
+ }
+
// pass 2: try to fill in the missing chars, looking for ligatures,
// numeric
// references and variants
if (missing) {
Hopefully you'll have a better idea as to how to proceed.
-apw
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#681251: synce-hal: Switch dependancies from dhcp3-client to isc-dhcp-client
Package: synce-hal
Version: 0.15-1.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Switch dependancies from the now obsolete transitional package
dhcp3-client to the replacement isc-dhcp-client.
Thanks for considering this patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-26-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru synce-hal-0.15/debian/changelog synce-hal-0.15/debian/changelog
diff -Nru synce-hal-0.15/debian/control synce-hal-0.15/debian/control
--- synce-hal-0.15/debian/control 2012-04-22 13:00:41.0 +0100
+++ synce-hal-0.15/debian/control 2012-07-11 11:16:42.0 +0100
@@ -10,7 +11,7 @@
Package: synce-hal
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ppp, net-tools, dhcp3-client, hal, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, ppp, net-tools, isc-dhcp-client, hal, python
Conflicts: synce-serial, odccm
Replaces: odccm
Provides: odccm
Bug#676405: syslinux FTBS against linux kernel headers from v3.4
Package: syslinux
Version: 2:4.05+dfsg-5
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
We are test building against linux kernels at version v3.4, syslinux
will no longer build against the kernel headers as linux/ext2_fs.h has
been removed intentionally:
commit 4a165d25f63a989d0aabe9d8eed5b3a5d5da1862
Author: Thierry Reding thierry.red...@avionic-design.de
Date: Fri Mar 23 10:27:36 2012 +0100
ext2: No longer export ext2_fs.h to user space
Since the on-disk format has been stable for quite some time, users
should either use the headers provided by libext2fs or keep a private
copy of this header. For the full discussion, see this thread:
https://lkml.org/lkml/2012/3/21/516
While at it, this commit removes all __KERNEL__ guards, which are now
unnecessary.
Signed-off-by: Thierry Reding thierry.red...@avionic-design.de
Cc: Al Viro v...@zeniv.linux.org.uk
Cc: Jan Kara j...@suse.cz
Cc: Ted Ts'o ty...@mit.edu
Cc: Artem Bityutskiy dedeki...@gmail.com
Cc: Andreas Dilger aedil...@gmail.com
Cc: linux-e...@vger.kernel.org
This fix switches us to use the libext2fs-dev copy.
* Fix reference to linux/ext2_fs.h which is now removed from the kernel
exported headers as of v3.4. Instead use the offical userspace copy
exported by e2fslibs-dev. Fixes FTBS with 3.4.x kernels.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-25-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru syslinux-4.05+dfsg/debian/changelog syslinux-4.05+dfsg/debian/changelog
diff -Nru syslinux-4.05+dfsg/debian/control syslinux-4.05+dfsg/debian/control
--- syslinux-4.05+dfsg/debian/control 2012-05-23 05:52:48.0 +0100
+++ syslinux-4.05+dfsg/debian/control 2012-06-06 18:56:17.0 +0100
@@ -5,7 +5,7 @@
Uploaders: Otavio Salvador ota...@debian.org
Build-Depends:
debhelper (= 9), gcc-4.6, gcc-multilib [amd64], libc6-dev-i386 [amd64],
- nasm, python, uuid-dev
+ nasm, python, uuid-dev, e2fslibs-dev
Standards-Version: 3.9.3
Homepage: http://syslinux.zytor.com/
diff -Nru syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch
--- syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch 1970-01-01 01:00:00.0 +0100
+++ syslinux-4.05+dfsg/debian/patches/11-local-ext2_fs.h.patch 2012-06-06 18:24:37.0 +0100
@@ -0,0 +1,13 @@
+Index: syslinux-4.05+dfsg/libinstaller/linuxioctl.h
+===
+--- syslinux-4.05+dfsg.orig/libinstaller/linuxioctl.h 2011-12-09 18:28:17.0 +
syslinux-4.05+dfsg/libinstaller/linuxioctl.h 2012-06-06 18:24:27.505927482 +0100
+@@ -19,7 +19,7 @@
+
+ #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */
+ #undef SECTOR_BITS
+-#include linux/ext2_fs.h /* EXT2_IOC_* */
++#include ext2fs/ext2_fs.h /* EXT2_IOC_* */
+
+ #ifndef FAT_IOCTL_GET_ATTRIBUTES
+ # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32)
diff -Nru syslinux-4.05+dfsg/debian/patches/series syslinux-4.05+dfsg/debian/patches/series
--- syslinux-4.05+dfsg/debian/patches/series 2012-05-23 05:52:48.0 +0100
+++ syslinux-4.05+dfsg/debian/patches/series 2012-06-06 18:24:00.0 +0100
@@ -8,3 +8,4 @@
08-as-needed.patch
09-efi-mbr.patch
10-conffiles.patch
+11-local-ext2_fs.h.patch
Bug#665590: Patch to convert headers to use glib.h
We have just applied the patch below in Ubuntu, this converts openhpi to use glib.h directly instead of the underlying header files. This fixes FTBS with newer glib versions: * src/lock.c: glib no longer permits include of individual headers, switch to including glib.h. (Closes: #665590). Please consider for Debian. -apw --- openhpi-2.14.1.orig/src/lock.c +++ openhpi-2.14.1/src/lock.c @@ -20,7 +20,7 @@ /* multi-threading support, use Posix mutex for data access */ /* initialize mutex used for data locking */ -#include glib/gthread.h +#include glib.h GStaticRecMutex oh_main_lock = G_STATIC_REC_MUTEX_INIT; -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#677279: gnat-gps recommends: ada-reference-manual-html which has been renamed
Package: gnat-gps
Version: 5.0-10
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
In Ubuntu, the attached patch was applied to fix a
reference via Recommends: of a package which no longer exists.
ada-reference-manual-html has been folded together with the other forms
into ada-reference-manual-2005. The package which provides this also now
provides an ada-reference-manual-2012, it is not clear whether we should
not Recommends: that version or indeed just Suggests: both. This patch
maintains the status-quo moving the Recommends: to the same version.
* Follow package name change from ada-reference-manual-* to
ada-reference-manual-2005.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-25-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnat-gps-5.0/debian/changelog gnat-gps-5.0/debian/changelog
diff -Nru gnat-gps-5.0/debian/control gnat-gps-5.0/debian/control
--- gnat-gps-5.0/debian/control 2012-05-19 13:39:10.0 +0100
+++ gnat-gps-5.0/debian/control 2012-06-12 21:09:50.0 +0100
@@ -63,7 +63,7 @@
Package: gnat-gps-doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: ada-reference-manual-html, gprbuild-doc
+Recommends: ada-reference-manual-2005, gprbuild-doc
Section: doc
Description: integrated development environment for C and Ada (documentation)
GNAT Programming Studio is a complete integrated development environment
Bug#705948: nyquist: FTBFS on i386 with corrupted #include specifiers
Package: nyquist
Version: 3.05-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer,
When building this package in Ubuntu Raring we are seeing reliable FTBFS
triggered by corrupted #include statements. This is triggered by an
overlapping strcpy() which is not permitted. Why this does not trigger
on other architectures is unclear.
In Ubuntu, the attached patch was applied to achieve the following:
* patches/intgen-avoid-overlapping-strcpy.patch: avoid illegal
overlapping strcpy invocation.
Thanks for considering the patch.
Andy.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring')
Architecture: i386 (i686)
Kernel: Linux 3.8.0-19-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru nyquist-3.05/debian/changelog nyquist-3.05/debian/changelog
diff -Nru nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch
--- nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch 1970-01-01 01:00:00.0 +0100
+++ nyquist-3.05/debian/patches/intgen-avoid-overlapping-strcpy.patch 2013-04-22 17:02:52.0 +0100
@@ -0,0 +1,17 @@
+Description: intgen avoid overlapping strcpy
+ Lisp intgen is using overlapping strcpy which is not permitted,
+ switch to using memmove.
+Author: Andy Whitcroft a...@ubuntu.com
+Last-Update: 2013-04-22
+
+--- nyquist-3.05.orig/misc/intgen.c
nyquist-3.05/misc/intgen.c
+@@ -487,7 +487,7 @@ static void process_file(fname, out)
+ /* strip off leading directory prefix, if any */
+ cp = strrchr(incl_file, FILESEP); /* find the last slash */
+ if (cp) {
+-strcpy(incl_file, cp + 1 /* skip the slash */);
++memmove(incl_file, cp + 1 /* skip the slash */, strlen(cp + 1) + 1);
+ }
+
+ if (flag != no_include_prefix) fprintf(out, #include \%s\\n\n, incl_file);
diff -Nru nyquist-3.05/debian/patches/series nyquist-3.05/debian/patches/series
--- nyquist-3.05/debian/patches/series 2012-07-18 02:02:31.0 +0100
+++ nyquist-3.05/debian/patches/series 2013-04-22 16:45:34.0 +0100
@@ -4,3 +4,4 @@
use-system-liblo.patch
use-system-portadio.patch
fix-term-includes.patch
+intgen-avoid-overlapping-strcpy.patch
Bug#732424: gstreamer0.10: deprecated option YYLEX_PARAM has been removed from bison leading to FTBFS
Package: gstreamer0.10
Version: 0.10.36-1.2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
While rebuilding Trusty with a recent version of bison it was noted that
the YYLEX_PARAM has finally been removed. This patch updates gstreamer
to use the replacement %lex-param:
* 99_YYLEX_PARAM-deprecated.patch: follow deprecation of YYLEX_PARAM
in favour of %lex-param. Fixes FTBFS following bison update.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gstreamer0.10-0.10.36/debian/patches/99_YYLEX_PARAM-deprecated.patch gstreamer0.10-0.10.36/debian/patches/99_YYLEX_PARAM-deprecated.patch
--- gstreamer0.10-0.10.36/debian/patches/99_YYLEX_PARAM-deprecated.patch 1970-01-01 01:00:00.0 +0100
+++ gstreamer0.10-0.10.36/debian/patches/99_YYLEX_PARAM-deprecated.patch 2013-12-17 19:15:21.0 +
@@ -0,0 +1,21 @@
+Description: switch to %lex-param
+ Follow deprecation of YYLEX_PARAM, switching to equivalent %lex-param.
+Author: Andy Whitcroft a...@canonical.com
+Last-Update: 2013-12-17
+
+--- gstreamer0.10-0.10.36.orig/gst/parse/grammar.y
gstreamer0.10-0.10.36/gst/parse/grammar.y
+@@ -1,3 +1,5 @@
++%lex-param {yyscan_t scanner}
++
+ %{
+ #include ../gst_private.h
+
+@@ -26,7 +28,6 @@
+ */
+
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+
+ #define YYENABLE_NLS 0
+
diff -Nru gstreamer0.10-0.10.36/debian/patches/series gstreamer0.10-0.10.36/debian/patches/series
--- gstreamer0.10-0.10.36/debian/patches/series 2013-12-12 07:36:19.0 +
+++ gstreamer0.10-0.10.36/debian/patches/series 2013-12-17 19:14:11.0 +
@@ -3,3 +3,4 @@
99_ltmain_as-needed.patch
01_fix_webcam_stream_play_hang.patch
99_update-libtool.patch
+99_YYLEX_PARAM-deprecated.patch
Bug#733361: libsmi: FTBFS: parser-smi.c:3093:7: error: too few arguments to function 'smilex'
Package: libsmi
Version: 0.4.8+dfsg2-8
Followup-For: Bug #733361
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following to
fix an FTBFS:
* lib/parser/smi{,ng}.y: follow change from *_PARAM to %*-param.
* lib/parser/smi{,ng}.y: follow yyerror() parameterisation changes.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libsmi-0.4.8+dfsg2/debian/changelog libsmi-0.4.8+dfsg2/debian/changelog
diff -Nru libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch
--- libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch 1970-01-01 01:00:00.0 +0100
+++ libsmi-0.4.8+dfsg2/debian/patches/bison-follow-parameter-handling-changes.patch 2014-04-17 00:43:27.0 +0100
@@ -0,0 +1,75 @@
+Description: follow flex parameter specification change
+ Follow change from *_PARAM to %*-param after deprecation in flex.
+ Follow yyerror() parameterisation changes.
+Author: Andy Whitcroft a...@canonical.com
+
+Index: libsmi-0.4.8+dfsg2/lib/parser-smi.y
+===
+--- libsmi-0.4.8+dfsg2.orig/lib/parser-smi.y 2014-04-16 23:49:33.0 +0100
libsmi-0.4.8+dfsg2/lib/parser-smi.y 2014-04-17 00:31:50.152357333 +0100
+@@ -11,6 +11,9 @@
+ * @(#) $Id: parser-smi.y 8090 2008-04-18 12:56:29Z strauss $
+ */
+
++%parse-param { struct Parser *parserPtr }
++%lex-param { struct Parser *parserPtr }
++
+ %{
+
+ #include config.h
+@@ -43,14 +46,6 @@
+
+
+
+-/*
+- * These arguments are passed to yyparse() and yylex().
+- */
+-#define YYPARSE_PARAM parserPtr
+-#define YYLEX_PARAM parserPtr
+-
+-
+-
+ #define thisParserPtr ((Parser *)parserPtr)
+ #define thisModulePtr (((Parser *)parserPtr)-modulePtr)
+
+Index: libsmi-0.4.8+dfsg2/lib/parser-sming.y
+===
+--- libsmi-0.4.8+dfsg2.orig/lib/parser-sming.y 2014-04-16 23:49:33.0 +0100
libsmi-0.4.8+dfsg2/lib/parser-sming.y 2014-04-17 00:31:41.288357640 +0100
+@@ -11,6 +11,9 @@
+ * @(#) $Id: parser-sming.y 7966 2008-03-27 21:25:52Z schoenw $
+ */
+
++%parse-param { struct Parser *parserPtr }
++%lex-param { struct Parser *parserPtr }
++
+ %{
+
+ #include config.h
+@@ -48,13 +51,6 @@
+ #endif
+
+
+-/*
+- * These arguments are passed to yyparse() and yylex().
+- */
+-#define YYPARSE_PARAM parserPtr
+-#define YYLEX_PARAM parserPtr
+-
+-
+
+ #define thisParserPtr ((Parser *)parserPtr)
+ #define thisModulePtr (((Parser *)parserPtr)-modulePtr)
+Index: libsmi-0.4.8+dfsg2/lib/error.h
+===
+--- libsmi-0.4.8+dfsg2.orig/lib/error.h 2014-04-17 00:36:14.684348162 +0100
libsmi-0.4.8+dfsg2/lib/error.h 2014-04-17 00:36:31.740347571 +0100
+@@ -22,7 +22,7 @@
+ #ifdef yyerror
+ #undef yyerror
+ #endif
+-#define yyerror(msg) smiyyerror(msg, parserPtr)
++#define yyerror(parserPtr, msg) smiyyerror(msg, parserPtr)
+
+
+ extern int smiErrorLevel; /* Higher levels produce more warnings */
diff -Nru libsmi-0.4.8+dfsg2/debian/patches/series libsmi-0.4.8+dfsg2/debian/patches/series
--- libsmi-0.4.8+dfsg2/debian/patches/series 2013-10-27 21:27:03.0 +
+++ libsmi-0.4.8+dfsg2/debian/patches/series 2014-04-17 00:44:37.0 +0100
@@ -3,3 +3,4 @@
cve-2010-2891.patch
libsmi-format.patch
segfault-bug600076.patch
+bison-follow-parameter-handling-changes.patch
Bug#746390: ruby-kgio: FTBFS (ppc64el): test_default_wait(TestDefaultWait) page size assumptions too small for 64K page size architectures
Package: ruby-kgio Version: 2.9.2-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu utopic ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/p/fix-test-test_default_wait: fix up bad assumption in test that reading 16K is sufficient to open write space in a pipe. Also add commentary to the test for the next person who hits this. This fixes an FTBFS on ppc64el (and any other linux architecture with page sizes above 16KB. Thanks for considering the patch. -apw -- System Information: Debian Release: jessie/sid APT prefers trusty-updates APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty'), (100, 'trusty-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.13.0-25-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash diff -Nru ruby-kgio-2.9.2/debian/changelog ruby-kgio-2.9.2/debian/changelog diff -Nru ruby-kgio-2.9.2/debian/patches/fix-test-test_default_wait ruby-kgio-2.9.2/debian/patches/fix-test-test_default_wait --- ruby-kgio-2.9.2/debian/patches/fix-test-test_default_wait 1970-01-01 01:00:00.0 +0100 +++ ruby-kgio-2.9.2/debian/patches/fix-test-test_default_wait 2014-04-29 15:21:57.0 +0100 @@ -0,0 +1,27 @@ +Description: fix test to take account of larger page sizes on ppc64el + The test_default_wait/TestDefaultWait test assume that a single read + can definatly switch a full pipe to one which will poll writable. The + kernel optimises for IO size by delaying the writable status until a + complete buffer slot is available; these are the system page. The test + already exhibits this by using large IOs compared to the common 4K page + size, but this is not sufficient in the face of the 64K page sizes on + ppc64el. Up this to 64k which represents the biggest page size available + in the kernel. +Author: Andy Whitcroft a...@canonical.com +Last-Update: 2014-04-29 + +--- ruby-kgio-2.9.2.orig/test/test_default_wait.rb ruby-kgio-2.9.2/test/test_default_wait.rb +@@ -39,7 +39,11 @@ class TestDefaultWait Test::Unit::Test + diff = Time.now - t0 + assert_in_delta diff, 1.1, 0.2 + +-a.kgio_read(16384) ++# Read enough to ensure one kernel buffer is cleared ++# to ensure that poll et al will start saying we have ++# enough space to allow a write. This should be at ++# least the largest system page size we support. ++a.kgio_read(65536) + assert_equal b, b.kgio_wait_writable(1.1) + end + end diff -Nru ruby-kgio-2.9.2/debian/patches/series ruby-kgio-2.9.2/debian/patches/series --- ruby-kgio-2.9.2/debian/patches/series 2014-04-09 21:11:14.0 +0100 +++ ruby-kgio-2.9.2/debian/patches/series 2014-04-29 15:16:37.0 +0100 @@ -1 +1,2 @@ fix-test +fix-test-test_default_wait
Bug#771298: openafs-modules-dkms: fails to build against v3.18 based kernels
Package: openafs
Version: 1.6.10-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch
Dear Maintainer,
In Ubuntu we are about to switch up to a v3.18 based kernel. It seems
there are a trio of incompatibilities exposed there for the DKMS module.
They all seem pretty safely fixed, and we have just uploaded that to
Ubuntu for testing.
In Ubuntu, the attached patch was applied to achieve the following:
* Upstream v3.18 porting (LP: #1397275):
- follow removal of key_type match op
- follow removal of ctl_table typedef
- d_invalidate now returns void
Thanks for considering these patches for Debian.
-apw
-- System Information:
Debian Release: jessie/sid
APT prefers vivid-updates
APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'),
(100, 'vivid-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.18.0-4-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru openafs-1.6.10/debian/changelog openafs-1.6.10/debian/changelog
diff -Nru openafs-1.6.10/debian/patches/series openafs-1.6.10/debian/patches/series
--- openafs-1.6.10/debian/patches/series 2014-11-06 20:06:47.0 +
+++ openafs-1.6.10/debian/patches/series 2014-11-27 21:21:32.0 +
@@ -1,3 +1,6 @@
0001-userok.c-Fix-fixed-size-on-stack-path-buffers.patch
0002-Tweak-AFSDIR_PATH_MAX-definition.patch
0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
+ubuntu-v3.18-key_type-removes-match.patch
+ubuntu-v3.18-typedef-ctl_table-removed.patch
+ubuntu-v3.18-d_invalidate-returns-void.patch
diff -Nru openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch
--- openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch 1970-01-01 01:00:00.0 +0100
+++ openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch 2014-11-27 21:42:33.0 +
@@ -0,0 +1,61 @@
+Description: v3.18 porting -- d_invalidate now returns void
+ In v3.18 they have changed d_invalidate to return void as it can no
+ longer fail. Comment out the recovery code as it is no longer needed.
+Author: Andy Whitcroft a...@ubuntu.com
+---
+
+--- openafs-1.6.10.orig/src/afs/LINUX/osi_vcache.c
openafs-1.6.10/src/afs/LINUX/osi_vcache.c
+@@ -39,11 +39,15 @@ restart:
+ dget_locked(dentry);
+
+ spin_unlock(dcache_lock);
++#if defined(D_INVALIDATE_NOT_VOID)
+ if (d_invalidate(dentry) == -EBUSY) {
+ dput(dentry);
+ /* perhaps lock and try to continue? (use cur as head?) */
+ goto inuse;
+ }
++#else
++ d_invalidate(dentry);
++#endif
+ dput(dentry);
+ spin_lock(dcache_lock);
+ goto restart;
+@@ -71,11 +75,15 @@ restart:
+ dget(dentry);
+
+ spin_unlock(inode-i_lock);
++#if defined(D_INVALIDATE_NOT_VOID)
+ if (d_invalidate(dentry) == -EBUSY) {
+ dput(dentry);
+ /* perhaps lock and try to continue? (use cur as head?) */
+ goto inuse;
+ }
++#else
++ d_invalidate(dentry);
++#endif
+ dput(dentry);
+ spin_lock(inode-i_lock);
+ goto restart;
+--- openafs-1.6.10.orig/src/cf/linux-test4.m4
openafs-1.6.10/src/cf/linux-test4.m4
+@@ -182,6 +182,18 @@ AC_DEFUN([LINUX_INODE_SETATTR_RETURN_TYP
+ ])
+
+
++AC_DEFUN([LINUX_D_INVALIDATE_RETURN_TYPE], [
++ AC_CHECK_LINUX_BUILD([for d_invalidate return type],
++ [ac_cv_linux_func_d_invalidater_returns_int],
++ [#include linux/dentry.h],
++ [struct dentry _dentry;
++ int i;
++ i = d_invalidate(_dentry);],
++ [D_INVALIDATE_NOT_VOID],
++ [define if your d_invalidate return return non-void],
++ [])
++])
++
+
+ AC_DEFUN([LINUX_AOP_WRITEBACK_CONTROL], [
+ AC_CHECK_LINUX_BUILD([whether aop.writepage takes a writeback_control],
diff -Nru openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch
--- openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch 1970-01-01 01:00:00.0 +0100
+++ openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch 2014-11-27 21:42:13.0 +
@@ -0,0 +1,46 @@
+Description: v3.18 porting -- follow removal of key_type match op
+ In v3.18 they have removed the key_type match op. This now defaults to
+ a direct match. As this is what the afs match does we can simply stop
+ supplying our match.
+Author: Andy Whitcroft a...@ubuntu.com
+---
+
+Index: openafs-1.6.10/acinclude.m4
+===
+--- openafs-1.6.10.orig/acinclude.m4
openafs-1.6.10/acinclude.m4
+@@ -842,6 +842,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinu
+ AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
+ AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h
Bug#771298: openafs-modules-dkms: fails to build against v3.18 based kernels
On Sat, Nov 29, 2014 at 02:43:45PM -0500, Benjamin Kaduk wrote: Thanks for considering these patches for Debian. Hi Andy, I'm happy to bring support for openafs on the 3.18 kernel to Debian; it hadn't been a priority yet since Debian is running a somewhat older kernel. However, I'm more likely to do so by cherry-picking upstream's patches than by importing Ubuntu's patches. There's actually a 1.6.11pre1 upstream release candidate in the process of being announced (e.g., https://github.com/openafs/openafs/releases/tag/openafs-stable-1_6_11pre1), which should work on at least 3.18rc5 (I don't have data about rc6). Would you prefer to have 1.6.11pre1 in debian experimental or just the 3.18- (and 3.17-)support patches pulled into debian unstable? There probably would not be substantial harm from puttin 1.6.11pre1 itself into unstable, but my general preference is to put prereleases into experimental. For Ubuntu I think what we have will tide us over until the upstream release is ready (and in Debian) so I don't think there is any need to pull a pre-release if that is not your normal practice. It is likely to make it long before we are set in stone here anyhow. Thank you for considering these changes. -apw -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#775185: conmux: has only upstart job, no upstart dependency
On Mon, 12 Jan 2015 12:18:11 +0100 Martin Pitt mp...@debian.org wrote: Package: conmux Version: 0.12.0-1 Hello, conmux currently only ships two upstart jobs, but no SysV init script or systemd unit(s). It doesn't do anything when installing it under systemd or sysvinit. If this is intentional and conmux only works under upstart for some reason, this should perhaps grow an upstart dependency and Architecture: linux-all? No this is an oversight, it is a simple daemon which ought to start if installed regardless of the init system in use. Adding appropriate systemd units etc seems appropriate. -apw -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#769576: linux: Btrfs goes forced readonly when qgroup already exists
On Sun, Jan 04, 2015 at 07:05:24PM +0100, Sebastiaan L. Zoutendijk wrote: Control: submitter -1 ! Hello Joe, On Sat 3 Jan 2015 at 16:02:12 -0500, Joseph Salisbury wrote: Would it be possible for you to also open a bug in Launchpad for this? It can be done by running the following from a terminal: ubuntu-bug linux Thank you for your directions, but I fear I wasn't clear enough in my previous mail. This is not a bug specific to Ubuntu (I am not even using Ubuntu), this is a bug in the Extended Stable 3.16 kernel [1], the upstream for both Ubuntu and Debian. The wiki page [2] told me to send a mail to this address. [1] http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y [2] https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable If I still should file a Launchpad bug, where should I file it? Not at the Ubuntu package, I'd think? But I can't find a Launchpad project for the Extended Stable kernel. Sorry for the confusion, Kamal, Henrix, one to consider. -apw -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#795831: initramfs-tools: ensure error output from switch_root/run-init are on the console
Package: initramfs-tools
Version: 0.120
Severity: normal
When switching into the real root partition using switch_root/run-init
we do not specifically direct the error output, as a result it may not
end up visible to the user. Send it with the primary output to the
console.
-apw
From 223559b93fc219987fd8cbe50efdd9e73f220f81 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft a...@canonical.com
Date: Mon, 25 Jun 2012 11:35:30 +0100
Subject: [PATCH] Add 21 to the run-init line.
Signed-off-by: Andy Whitcroft a...@ubuntu.com
---
init | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init b/init
index abf7f25..7a8dfce 100755
--- a/init
+++ b/init
@@ -332,9 +332,9 @@ mount -n -o move /proc ${rootmnt}/proc
# Chain to real filesystem
if [ -z $drop_caps ] command -v switch_root /dev/null 21; then
- exec switch_root ${rootmnt} ${init} $@ ${rootmnt}/dev/console ${rootmnt}/dev/console
+ exec switch_root ${rootmnt} ${init} $@ ${rootmnt}/dev/console ${rootmnt}/dev/console 21
elif command -v run-init /dev/null 21; then
- exec run-init ${drop_caps} ${rootmnt} ${init} $@ ${rootmnt}/dev/console ${rootmnt}/dev/console
+ exec run-init ${drop_caps} ${rootmnt} ${init} $@ ${rootmnt}/dev/console ${rootmnt}/dev/console 21
fi
echo Something went badly wrong in the initramfs.
panic Please file a bug on initramfs-tools.
--
2.5.0
Bug#795833: initramfs-tools: add mountroot failure support to allow meaningful messages and recovery attempts
Package: initramfs-tools
Version: 0.120
Severity: normal
Allow hooks to supply specific root mount failure handlers. These can
both report more specific failure reasons, and in some cases may even be
able to attempt recovery. This is useful for more complex scenarios
such as LVM and mdadm setups.
We use this in Ubuntu to allow augmented lvm2 and mdadm hooks to recover
failed raids and the like.
NOTE: that the splash handling here may well be Ubuntu specific.
-apw
From 2f96b329734edeb03d769da83cce1dc06e6c81bb Mon Sep 17 00:00:00 2001
From: Andy Whitcroft a...@canonical.com
Date: Mon, 25 Jun 2012 12:13:07 +0100
Subject: [PATCH] Add mountroot failure support, to allow meaningful messages
when no root device can be found.
Signed-off-by: Andy Whitcroft a...@ubuntu.com
---
docs/example_script | 13 +
initramfs-tools.8 | 14 ++
scripts/functions | 36
3 files changed, 63 insertions(+)
diff --git a/docs/example_script b/docs/example_script
index 5e9153b..93d1135 100644
--- a/docs/example_script
+++ b/docs/example_script
@@ -26,10 +26,23 @@ prereqs)
prereqs
exit 0
;;
+mountfail) # Called if the script has previously registered a mountroot
+ # failure.
+ # Check status, and display any relevant information about the
+ # failure if there is a problem, then exit with a status of 1.
+ ;;
esac
# Do the work here.
+# If this script is to be placed in either init-premount, or local-top,
+# register a mountroot failure hook, so that further information can be given
+# to the user, in the event that the root device cannot be found.
+
+. /scripts/functions
+
+add_mountroot_fail_hook
+
echo Got here!
exit 0
diff --git a/initramfs-tools.8 b/initramfs-tools.8
index ea8c098..4f873b1 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -387,6 +387,20 @@ user to investigate the situation.
.PP
.B Example:
panic Frobnication failed
+.fi
+.RE
+.RE
+
+.TP
+\fB\fI
+add_mountroot_fail_hook
+Registers the script as able to provide possible further information, in the
+event that the root device cannot be found. See the example script in the
+initramfs-tools examples directory for more information.
+.RS
+.PP
+.B Example:
+add_mountroot_fail_hook
.RE
.SS Subdirectories
diff --git a/scripts/functions b/scripts/functions
index 073fcb3..74083ed 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -31,6 +31,42 @@ log_end_msg()
_log_msg done.\n
}
+# Add failure hook
+add_mountroot_fail_hook()
+{
+ mkdir -p /tmp/mountroot-fail-hooks.d
+ ln -s $0 /tmp/mountroot-fail-hooks.d/$1
+}
+
+# Run failure hooks.
+# When a failure hook exits 1, it has not done anything to correct the
+# system. Exiting 0 means that something has been attempted to resolve
+# the lack of a root filesystem.
+# Hooks are run in lexigraphical order, and are responsible for removing
+# themselves if they should not re-run in a later cycle. When one exits
+# 0, the stack is stopped, so the caller can return to the main rootfs
+# wait loop.
+try_failure_hooks()
+{
+ local hook
+
+ # Disable usplash so text from hooks can be seen
+ if [ -x /sbin/usplash_write ]; then
+ /sbin/usplash_write QUIT
+ fi
+ chvt 1
+ if [ -x /bin/plymouth ] plymouth --ping; then
+ /bin/plymouth hide-splash /dev/null 21
+ fi
+
+ for hook in /tmp/mountroot-fail-hooks.d/*; do
+ if [ -x ${hook} ] ${hook} mountfail; then
+ return 0
+ fi
+ done
+ return 1
+}
+
panic()
{
if command -v chvt /dev/null 21; then
--
2.5.0
Bug#795832: initramfs-tools: allow the specificication of multiple break points using a comma delimiter
Package: initramfs-tools
Version: 0.120
Severity: normal
When debugging an initramfs you may wish to stop at more than one break
point in the same run. Allow specification of multiple break points on
the command line using break=a,b syntax.
-apw
From 037406f31a564ace91389d952f71202ab7745532 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft a...@canonical.com
Date: Mon, 25 Jun 2012 11:17:57 +0100
Subject: [PATCH] Allow specifying multiple break points using a comma
delimiter.
Signed-off-by: Andy Whitcroft a...@ubuntu.com
---
scripts/functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/functions b/scripts/functions
index 8c1bb1f..073fcb3 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -58,7 +58,7 @@ panic()
maybe_break()
{
- if [ ${break:-} = $1 ]; then
+ if echo ${break:-} | egrep -q (,|^)$1(,|$); then
panic Spawning shell within the initramfs
fi
}
--
2.5.0
Bug#795837: initramfs-tools: calls dpkg with obsolete relation operator ''
Package: initramfs-tools
Version: 0.120
Severity: minor
It seems that with newer dpkg we get warnings about the use of obsolete
relation operator '' during builds of the initramfs. We are using the
attached patch for this in Ubuntu.
-apw
From e8454859aa8171c0b17c85ad2cca5cf6710fefa1 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft a...@canonical.com
Date: Wed, 5 Aug 2015 15:27:08 +0100
Subject: [PATCH] update-initramfs: switch dpkg --compare-versions from to =
to avoid warnings from dpkg. (LP: #1480340)
Signed-off-by: Andy Whitcroft a...@ubuntu.com
---
update-initramfs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/update-initramfs b/update-initramfs
index ea301ba..5aa2186 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -237,7 +237,7 @@ get_sorted_versions()
fi
worklist=
for gsv_i in $version_list; do
- if dpkg --compare-versions ${gsv_x} '' ${gsv_i} 2/dev/null; then
+ if dpkg --compare-versions ${gsv_x} '=' ${gsv_i} 2/dev/null; then
worklist=${worklist} ${gsv_x} ${gsv_i}
gsv_x=
else
--
2.5.0
Bug#795839: initramfs-tools: When adding i8042 also add psmouse as some keyboards are behind the mouse
Package: initramfs-tools Version: 0.120 Severity: normal hook-functions/auto_add_modules: include psmouse as some keyboards are connected to the pass-thru port on the PS2 mouse port (because that is such a good idea). -apw From 7d8426c44a92c8d58bf5e60611582302fb14c1e8 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft a...@canonical.com Date: Tue, 13 May 2014 18:32:00 +0100 Subject: [PATCH] When adding i8042 also add psmouse as some keyboards are behind the mouse. LP: #1314764 * hook-functions/auto_add_modules: include psmouse as some keyboards are connected to the pass-thru port on the PS2 mouse port because that is such a good idea). (LP: #1314764) Signed-off-by: Andy Whitcroft a...@canonical.com --- hook-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hook-functions b/hook-functions index ee1c205..3eb781d 100644 --- a/hook-functions +++ b/hook-functions @@ -524,7 +524,7 @@ auto_add_modules() modules=$modules btrfs ext2 ext3 ext4 ext4dev modules=$modules isofs jfs reiserfs udf xfs modules=$modules nfs nfsv2 nfsv3 nfsv4 - modules=$modules af_packet atkbd i8042 + modules=$modules af_packet atkbd i8042 psmouse modules=$modules virtio_pci virtio_mmio # Include all HID drivers unless we're sure they -- 2.5.0
Bug#790859: avogadro: Patch for FTBFS against updated cmake
Package: avogadro
Version: 1.1.0-4
Followup-For: Bug #790859
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer,
While fixing gcc-5 related fallout the following patch was needed for
avogadro to handle a semantic change in newer cmake. cmake QT search et al
no longer automatically loads X11 detection we have to probe it explicitly.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: jessie/sid
APT prefers wily-updates
APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'),
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch
--- avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch 1970-01-01 01:00:00.0 +0100
+++ avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch 2015-08-10 20:56:07.0 +0100
@@ -0,0 +1,17 @@
+Description: probe X11 paths with find_package(X11)
+ cmake no longer automatically probes for X11 when probling for QT et al.
+ We now need to manually load X11 when needed.
+Author: Andy Whitcroft a...@ubuntu.com
+
+Index: avogadro-1.1.1/avogadro/src/CMakeLists.txt
+===
+--- avogadro-1.1.1.orig/avogadro/src/CMakeLists.txt
avogadro-1.1.1/avogadro/src/CMakeLists.txt
+@@ -107,6 +107,7 @@ if(QtTesting)
+ target_link_libraries(avogadro-app QtTesting)
+ endif()
+ if(Q_WS_X11)
++ find_package(X11 REQUIRED)
+ target_link_libraries(avogadro-app ${X11_X11_LIB})
+ endif()
+
diff -Nru avogadro-1.1.1/debian/patches/series avogadro-1.1.1/debian/patches/series
--- avogadro-1.1.1/debian/patches/series 2014-02-12 11:09:50.0 +
+++ avogadro-1.1.1/debian/patches/series 2015-08-10 20:57:49.0 +0100
@@ -1,2 +1,3 @@
link_to_libgl2ps.patch
boost148.patch
+probe-X11-paths-with-find_package.patch
Bug#795089: wxhexeditor fails to build due to link line ordering on libgomp
Package: wxhexeditor
Version: 0.23+repack-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer,
While handling the gcc-5 transitions it was found that wxhexeditor no
longer builds due to --as-needed no longer being the default. We reordered
the link line to avoid this issue.
Thanks for considering the patch.
-- System Information:
Debian Release: jessie/sid
APT prefers wily-updates
APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'),
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru wxhexeditor-0.23+repack/debian/patches/50-reorder-link-line-to-fix-FTBFS-against-libgomp.patch wxhexeditor-0.23+repack/debian/patches/50-reorder-link-line-to-fix-FTBFS-against-libgomp.patch
--- wxhexeditor-0.23+repack/debian/patches/50-reorder-link-line-to-fix-FTBFS-against-libgomp.patch 1970-01-01 01:00:00.0 +0100
+++ wxhexeditor-0.23+repack/debian/patches/50-reorder-link-line-to-fix-FTBFS-against-libgomp.patch 2015-08-10 14:29:13.0 +0100
@@ -0,0 +1,18 @@
+Description: reorder link line to avoid FTBFS against libgomp
+ We are failing to link libgomp as it is presented too early on the link
+ line shift the linker flags later to ensure it is considered.
+Author: Andy Whitcroft a...@canonical.com
+
+Index: wxhexeditor-0.23+repack/Makefile
+===
+--- wxhexeditor-0.23+repack.orig/Makefile
wxhexeditor-0.23+repack/Makefile
+@@ -46,7 +46,7 @@ $(OBJECTS): $(LIBS) $(SOURCES)
+ MOBJECTS=$(LANGUAGES:.po=.mo)
+
+ $(EXECUTABLE): $(OBJECTS)
+- $(CXX) ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} $(OBJECTS) $(LIBS) $(WXLDFLAGS) -o $@
++ $(CXX) ${CXXFLAGS} ${CPPFLAGS} $(OBJECTS) $(LIBS) $(WXLDFLAGS) ${LDFLAGS} -o $@
+
+ .cpp.o: $(LIBS)
+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(WXCXXFLAGS) $ -o $@
diff -Nru wxhexeditor-0.23+repack/debian/patches/series wxhexeditor-0.23+repack/debian/patches/series
--- wxhexeditor-0.23+repack/debian/patches/series 2015-06-10 07:25:58.0 +0100
+++ wxhexeditor-0.23+repack/debian/patches/series 2015-08-10 14:15:21.0 +0100
@@ -4,3 +4,4 @@
08-remove-debug.patch
11-wx3.0-fix-ftbfs-on-arm.patch
12-disable-newer-upstream-version-check.patch
+50-reorder-link-line-to-fix-FTBFS-against-libgomp.patch
Bug#804457: imapfilter: Uses SSLv3 method
Package: imapfilter Version: 1:2.6.2-1 Followup-For: Bug #804457 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu xenial ubuntu-patch Dear Maintainer, We recently have disabled SSLv3 in Ubuntu as part of testing that we found that imapfilter coredumped on startup. Looking at Debian we see that it is being disabled there such that imapfilter will no longer build. For Ubuntu we are applying the attached patch which follows the recommendation in this Bug and as such should fix the issue in Debian also: * Switch to using SSLv23_client_method in all cases to avoid using now removed/nutered protocols and increasing forward compatibility. (LP: #1516585). Thanks for considering the patch. -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial-proposed'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.2.0-19-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru imapfilter-2.6.2/debian/patches/series imapfilter-2.6.2/debian/patches/series --- imapfilter-2.6.2/debian/patches/series 2015-01-05 18:29:14.0 + +++ imapfilter-2.6.2/debian/patches/series 2015-11-16 12:53:46.0 + @@ -1 +1,2 @@ fix-makefile.diff +ubuntu-switch-to-SSLv23_client_method-and-use-CTX-options-to-select-protocol.patch diff -Nru imapfilter-2.6.2/debian/patches/ubuntu-switch-to-SSLv23_client_method-and-use-CTX-options-to-select-protocol.patch imapfilter-2.6.2/debian/patches/ubuntu-switch-to-SSLv23_client_method-and-use-CTX-options-to-select-protocol.patch --- imapfilter-2.6.2/debian/patches/ubuntu-switch-to-SSLv23_client_method-and-use-CTX-options-to-select-protocol.patch 1970-01-01 01:00:00.0 +0100 +++ imapfilter-2.6.2/debian/patches/ubuntu-switch-to-SSLv23_client_method-and-use-CTX-options-to-select-protocol.patch 2015-11-16 13:29:59.0 + @@ -0,0 +1,125 @@ +Description: switch to SSLv23_client_method() and use CTX options to select protocol + With us disabling SSLv3 we now either will not build (on Debian) or + coredump during initialisation. As per the Debian bug recommendation + switch to always using SSLv23_client_method() as that can handle the best + protocol available (including TLS etc) going forward. Where we need to + specify a specific protocol start using SSL_CTS_set_options() to limit + the negociable protocols. +Author: Andy Whitcroft <a...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/804457 +Bug-Ubuntu: https://launchpad.net/bugs/1516585 + +Index: imapfilter-2.6.2/src/imapfilter.c +=== +--- imapfilter-2.6.2.orig/src/imapfilter.c imapfilter-2.6.2/src/imapfilter.c +@@ -21,10 +21,7 @@ + + extern buffer ibuf, obuf, nbuf, cbuf; + extern regexp responses[]; +-extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx; +-#if OPENSSL_VERSION_NUMBER >= 0x01000100fL +-extern SSL_CTX *tls11ctx, *tls12ctx; +-#endif ++extern SSL_CTX *ssl23ctx; + + options opts; /* Program options. */ + environment env; /* Environment variables. */ +@@ -109,25 +106,13 @@ main(int argc, char *argv[]) + + SSL_library_init(); + SSL_load_error_strings(); +- ssl3ctx = SSL_CTX_new(SSLv3_client_method()); + ssl23ctx = SSL_CTX_new(SSLv23_client_method()); +- tls1ctx = SSL_CTX_new(TLSv1_client_method()); +-#if OPENSSL_VERSION_NUMBER >= 0x01000100fL +- tls11ctx = SSL_CTX_new(TLSv1_1_client_method()); +- tls12ctx = SSL_CTX_new(TLSv1_2_client_method()); +-#endif + + if (exists_dir(opts.truststore)) + capath = opts.truststore; + if (exists_file(opts.truststore)) + cafile = opts.truststore; +- SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath); + SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath); +- SSL_CTX_load_verify_locations(tls1ctx, cafile, capath); +-#if OPENSSL_VERSION_NUMBER >= 0x01000100fL +- SSL_CTX_load_verify_locations(tls11ctx, cafile, capath); +- SSL_CTX_load_verify_locations(tls12ctx, cafile, capath); +-#endif + + start_lua(); + #if LUA_VERSION_NUM < 502 +@@ -146,13 +131,7 @@ main(int argc, char *argv[]) + #endif + stop_lua(); + +- SSL_CTX_free(ssl3ctx); + SSL_CTX_free(ssl23ctx); +- SSL_CTX_free(tls1ctx); +-#if OPENSSL_VERSION_NUMBER >= 0x01000100fL +- SSL_CTX_free(tls11ctx); +- SSL_CTX_free(tls12ctx); +-#endif + ERR_free_strings(); + + regexp_free(responses); +Index: imapfilter-2.6.2/src/socket.c +=== +--- imapfilter-2.6.2.orig/src/socket.c imapfilter-2.6.2/src/socket.c +@@ -17,11 +17,7 @@ + #include "session.h" + + +-SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx; +-#if OPENSSL_VERSION_NUMBER >= 0x01000100fL +-SSL_CTX *tls11ctx, *tls12ctx; +-#endif +- ++SSL_CTX *ssl23ctx; + + /* + * Connect to mai
Bug#799443: initramfs-tools: avoid executing firmware and maintain symlinks
Package: initramfs-tools
Version: 0.120ubuntu5~rc2
Severity: normal
When adding firmware to the initramfs we currently use copy_exec() this
leads to us running ldd on the firmware, and effectivly attempting to
executing the firmware. As we have no control over the actual contents
of this firmware this can lead to us actually executing it; in Ubuntu we
have seen this with glibc.x32 installed and cirtain firmware leading to
crashes in ldd and initramfs build failures.
Additionally using copy_exec() uses cp -aL which squashes any symlinks,
while this ensures the firmware is available upstream firmware is starting
to use the below idiom to represent preferred versions of firmware, and
we will end up with multiple versions of the actual firmware in the
initramfs:
-rw-rw-r-- 1 apw apw 5872 Sep 19 08:51 bxt_dmc_ver1_04.bin
lrwxrwxrwx 1 apw apw 19 Sep 19 08:51 bxt_dmc_ver1.bin ->
bxt_dmc_ver1_04.bin
-rw-rw-r-- 1 apw apw 8380 Sep 19 08:51 skl_dmc_ver1_19.bin
-rw-rw-r-- 1 apw apw 8380 Sep 19 08:51 skl_dmc_ver1_20.bin
-rw-rw-r-- 1 apw apw 8824 Sep 19 08:51 skl_dmc_ver1_21.bin
lrwxrwxrwx 1 apw apw 19 Sep 19 08:51 skl_dmc_ver1.bin ->
skl_dmc_ver1_21.bin
-rw-rw-r-- 1 apw apw 109636 Sep 19 08:51 skl_guc_ver1_1059.bin
lrwxrwxrwx 1 apw apw 21 Sep 19 08:51 skl_guc_ver1.bin ->
skl_guc_ver1_1059.bin
In Ubuntu we are using the combination of the two attached patches to
solve these issues.
-apw
>From f7d9025b736edbd771fc5befc256d556a2f4204b Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <a...@canonical.com>
Date: Mon, 17 Feb 2014 11:51:59 +
Subject: [PATCH 1/2] hook-functions: when copying firmware, don't use
copy_exec
When copying firmware, don't use copy_exec; running ldd on random firmware files is annoying and, if libc-x32 is installed, may cause crashes due to lack of kernel support.
LP: #1115875
Signed-off-by: Andy Whitcroft <a...@canonical.com>
---
hook-functions | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hook-functions b/hook-functions
index ee1c205..0239d8a 100644
--- a/hook-functions
+++ b/hook-functions
@@ -101,10 +101,16 @@ manual_add_modules()
fi
if [ -e "/lib/firmware/${version}/${firmware}" ]; then
-copy_exec "/lib/firmware/${version}/${firmware}"
+firmware="/lib/firmware/$version/$firmware"
else
-copy_exec "/lib/firmware/${firmware}"
+firmware="/lib/firmware/$firmware"
fi
+
+ target_dir="$DESTDIR/$(dirname "$firmware")"
+ if ! [ -d "$target_dir" ]; then
+mkdir -p "$target_dir"
+ fi
+ cp -a "$firmware" "$target_dir"
if [ "${verbose}" = "y" ]; then
echo "Adding firmware ${firmware}"
fi
--
2.5.0
>From 18816c491ca53a13e66e1c1e2de13efcd05c23c3 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <a...@ubuntu.com>
Date: Fri, 18 Sep 2015 15:08:29 +0100
Subject: [PATCH 2/2] hook-functions: firmware -- copy symlink components into
initramfs
It is becoming increasingly common to use symbolic links to map preferred
versions of firmware where more than one is available:
-rw-rw-r-- 1 apw apw 5872 Sep 19 08:51 bxt_dmc_ver1_04.bin
lrwxrwxrwx 1 apw apw 19 Sep 19 08:51 bxt_dmc_ver1.bin -> bxt_dmc_ver1_04.bin
-rw-rw-r-- 1 apw apw 8380 Sep 19 08:51 skl_dmc_ver1_19.bin
-rw-rw-r-- 1 apw apw 8380 Sep 19 08:51 skl_dmc_ver1_20.bin
-rw-rw-r-- 1 apw apw 8824 Sep 19 08:51 skl_dmc_ver1_21.bin
lrwxrwxrwx 1 apw apw 19 Sep 19 08:51 skl_dmc_ver1.bin -> skl_dmc_ver1_21.bin
-rw-rw-r-- 1 apw apw 109636 Sep 19 08:51 skl_guc_ver1_1059.bin
lrwxrwxrwx 1 apw apw 21 Sep 19 08:51 skl_guc_ver1.bin -> skl_guc_ver1_1059.bin
Detect, follow and copy symlink chains.
LP: #1496163
Signed-off-by: Andy Whitcroft <a...@ubuntu.com>
---
hook-functions | 37 ++---
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/hook-functions b/hook-functions
index 0239d8a..1ee246c 100644
--- a/hook-functions
+++ b/hook-functions
@@ -54,6 +54,7 @@ add_modules_from_file()
manual_add_modules()
{
local prefix kmod options firmware
+ local target_dir depth firmware_link
if [ $# -eq 0 ]; then
return
@@ -106,13 +107,35 @@ manual_add_modules()
firmware="/lib/firmware/$firmware"
fi
- target_dir="$DESTDIR/$(dirname "$firmware")"
- if ! [ -d "$target_dir" ]; then
-mkdir -p "$target_dir"
- fi
- cp -a "$firmware" "$target_dir"
- if [ "${verbose}" = "y" ]; then
-echo "Adding firmware ${firmware}"
+ depth=10
+ while [ "$firmware" != '' -a "$depth" -gt 0 ]
+ do
+target_dir="$DESTDIR/$(dirname "$firmware")"
+if ! [ -d "$target_dir" ]; t
Bug#813678: blktap-dkms: fails to build with mainline 4.4 based kernels
Package: blktap-dkms
Version: 2.0.93-0.5
Severity: important
Tags: patch
User: a...@ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch
Mainline 4.4 switches how we detect atomicity. Follow that change when
compiling against 4.4 based kernels. We are using this in Ubuntu with
our latest kernels.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru blktap-dkms-2.0.93/debian/patches/series blktap-dkms-2.0.93/debian/patches/series
--- blktap-dkms-2.0.93/debian/patches/series 2015-12-17 08:41:17.0 +
+++ blktap-dkms-2.0.93/debian/patches/series 2016-02-04 09:42:41.0 +
@@ -3,3 +3,4 @@
bi_sector-fix.patch
mempool_resize.patch
disallow_mempools_with_ctor.patch
+use-gfpflags_allow_blocking-when-available.patch
diff -Nru blktap-dkms-2.0.93/debian/patches/use-gfpflags_allow_blocking-when-available.patch blktap-dkms-2.0.93/debian/patches/use-gfpflags_allow_blocking-when-available.patch
--- blktap-dkms-2.0.93/debian/patches/use-gfpflags_allow_blocking-when-available.patch 1970-01-01 01:00:00.0 +0100
+++ blktap-dkms-2.0.93/debian/patches/use-gfpflags_allow_blocking-when-available.patch 2016-01-22 15:26:56.0 +
@@ -0,0 +1,28 @@
+Description: use gfpflags_allow_blocking when available
+ Follow changes in mainline 4.4 which moves to using
+ gfpflags_allow_blocking() to identify critical sections.
+Author: Andy Whitcroft <a...@ubuntu.com>
+
+--- blktap-dkms-2.0.93.orig/request.c
blktap-dkms-2.0.93/request.c
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "blktap.h"
+
+@@ -338,8 +339,11 @@ static void*
+ __mempool_page_alloc(gfp_t gfp_mask, void *pool_data)
+ {
+ struct page *page;
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
+ if (!(gfp_mask & __GFP_WAIT))
++#else
++if (!gfpflags_allow_blocking(gfp_mask))
++#endif
+ return NULL;
+
+ page = alloc_page(gfp_mask);
Bug#813037: flashcache: will not build against mainline 4.4 based kernels
Source: flashcache Version: 3.1.3+git20150701-2 Severity: normal Dear Maintainer, The mainline 4.4 kernel removes the target specific ioctl hooks that the flashcache implmentation uses to hold its pid white/black list manipulation ioctls. Upstream do not care about out of tree drivers and therefore are not interested in reinstating this call. In Ubuntu we are mitiating this via a kernel patch which introduces a new target_ioctl and modifications to flashcache to use those. This is as much as anything heads up about the issue. -apw -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.3.0-5-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
Bug#812999: flashcache: we are not correctly recording the bio error code in 4.3
Package: flashcache Version: 3.1.3+git20150701-2 Severity: serious Tags: patch User: a...@ubuntu.com Usertags: origin-ubuntu xenial ubuntu-patch Dear Maintainer, While merging up the Ubuntu delta with the current flashcache it looks very much like we are not correctly passing over the BIO error code in the 4.3 compatibility code. We have the attached patch applied to correct this. Looking at upstream they also have fixed the 4.3 issue in the same manner. Cheers. -apw -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.3.0-5-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) diff -Nru flashcache-3.1.3+git20150701/debian/patches/record-bio-error-on-linux-4.3.patch flashcache-3.1.3+git20150701/debian/patches/record-bio-error-on-linux-4.3.patch --- flashcache-3.1.3+git20150701/debian/patches/record-bio-error-on-linux-4.3.patch 1970-01-01 01:00:00.0 +0100 +++ flashcache-3.1.3+git20150701/debian/patches/record-bio-error-on-linux-4.3.patch 2016-01-28 12:20:13.0 + @@ -0,0 +1,16 @@ +Description: record bio error on linux 4.3 + Record the bio error code when ending an IO on linux 4.3 and later. +Author: Andy Whitcroft <a...@ubuntu.com> + +Index: flashcache-3.1.3+git20150701/src/flashcache_subr.c +=== +--- flashcache-3.1.3+git20150701.orig/src/flashcache_subr.c flashcache-3.1.3+git20150701/src/flashcache_subr.c +@@ -739,6 +739,7 @@ flashcache_bio_endio(struct bio *bio, in + #elif LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0) + bio_endio(bio, error); + #else ++ bio->bi_error = error; + bio_endio(bio); + #endif + } diff -Nru flashcache-3.1.3+git20150701/debian/patches/series flashcache-3.1.3+git20150701/debian/patches/series --- flashcache-3.1.3+git20150701/debian/patches/series 2015-12-25 03:59:22.0 + +++ flashcache-3.1.3+git20150701/debian/patches/series 2016-01-27 16:27:07.0 + @@ -1,3 +1,4 @@ usable-makefile.patch honor-cflags-and-ldflags.patch fix-build-error-on-linux-4.3.patch +record-bio-error-on-linux-4.3.patch
Bug#813037: flashcache: patch to switch flashcache to use dm messages
Package: flashcache
Version: 3.1.3+git20150701-2
Followup-For: Bug #813037
User: a...@ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch
Hi,
After discussions with upstream we have found a different existing
mechamism to have target specific ioctl style calls. These are achieved
via DM messages. The attached patch switches the kernel component to
use DM messages to implement the whitelist/blacklist, and adds backwards
compatibility for those to the flashcache_setioctl helper.
Hope this is of use.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.3.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru flashcache-3.1.3+git20150701/debian/patches/switch-from-ioctl-to-dm-target-messages.patch flashcache-3.1.3+git20150701/debian/patches/switch-from-ioctl-to-dm-target-messages.patch
--- flashcache-3.1.3+git20150701/debian/patches/switch-from-ioctl-to-dm-target-messages.patch 1970-01-01 01:00:00.0 +0100
+++ flashcache-3.1.3+git20150701/debian/patches/switch-from-ioctl-to-dm-target-messages.patch 2016-01-29 21:26:43.0 +
@@ -0,0 +1,236 @@
+Description: switch from ioctl to dm target messages
+ Switch from ioctl to dm target messages for handling PID blacklist/whitelist
+ manipulation.
+Author: Andy Whitcroft <a...@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1538618
+
+Index: flashcache-3.1.3+git20150701/src/flashcache_conf.c
+===
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_conf.c
flashcache-3.1.3+git20150701/src/flashcache_conf.c
+@@ -1713,7 +1713,12 @@ static struct target_type flashcache_tar
+ .dtr= flashcache_dtr,
+ .map= flashcache_map,
+ .status = flashcache_status,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
+ .ioctl = flashcache_ioctl,
++#else
++ .prepare_ioctl = flashcache_prepare_ioctl,
++ .message= flashcache_message,
++#endif
+ .iterate_devices = flashcache_iterate_devices,
+ };
+
+Index: flashcache-3.1.3+git20150701/src/flashcache_ioctl.c
+===
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_ioctl.c
flashcache-3.1.3+git20150701/src/flashcache_ioctl.c
+@@ -503,6 +503,82 @@ skip_sequential_io(struct cache_c *dmc,
+ * exit, for cases where the process dies after marking itself
+ * non-cacheable.
+ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
++int
++flashcache_prepare_ioctl(struct dm_target *ti,
++ struct block_device **bdev, fmode_t *mode)
++{
++ struct cache_c *dmc = (struct cache_c *) ti->private;
++
++ *bdev = dmc->disk_dev->bdev;
++
++ return 0;
++}
++
++int
++flashcache_message(struct dm_target *ti, unsigned argc, char **argv)
++{
++ struct cache_c *dmc = (struct cache_c *) ti->private;
++ int list;
++ long long upid;
++ pid_t pid = 0;
++
++ /*
++ * whitelist|blacklist add|del
++ * whitelist|blacklist delall
++ */
++ if (argc < 2)
++ return -EINVAL;
++
++ /* Decode the primary command. */
++ if (strcmp(argv[0], "whitelist") == 0) {
++ list = FLASHCACHE_WHITELIST;
++ } else if (strcmp(argv[0], "blacklist") == 0) {
++ list = FLASHCACHE_BLACKLIST;
++ } else {
++ return -EINVAL;
++ }
++
++ /* Decode the sub-command. */
++ if (strcmp(argv[1], "add") == 0) {
++ int rr;
++ if (argc != 3)
++ return -EINVAL;
++
++ /* Decode the pid. */
++ if (kstrtoull(argv[2], 10, ))
++ return -EINVAL;
++ pid = (pid_t)upid;
++
++ flashcache_add_pid(dmc, pid, list);
++ return 0;
++
++ } else if (strcmp(argv[1], "del") == 0) {
++ if (argc != 3)
++ return -EINVAL;
++
++ /* Decode the pid. */
++ if (kstrtoull(argv[2], 10, ))
++ return -EINVAL;
++ pid = (pid_t)upid;
++
++ flashcache_del_pid(dmc, pid, list);
++ return 0;
++
++ } else if (strcmp(argv[1], "delall") == 0) {
++ if (argc != 2)
++ return -EINVAL;
++
++ flashcache_del_all_pids(dmc, list, 0);
++ return 0;
++
++ } else {
++ return -EINVAL;
++ }
++}
++
++#else
++
+ int
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)
+ flashcache_ioctl(struct dm_target *ti, struct inode *inode,
+@@ -561,3 +637,5 @@ flashcache_ioctl(struct dm_target *ti, u
+ }
+
+ }
++
++#endif
+Index: flashcache-3.1.3+git20150701/src/flashcache_ioctl.h
+===
+--- flashcache-3.1.3+git20150701.orig/src/flashcache_ioctl.h
flashcache-3.1.3+git20150701/src/flashcache_ioctl.h
+@@ -51,6 +51,11 @@ enum {
+ #define FLASHCACHEDELALLWHITELIST _IOW(FLASHCACHE_IOCTL, FLASHCACHEDELWHITELISTALL_CMD, pid_t)
+
+ #ifdef __KERNEL__
++#if LINUX_VERSION_CODE >=
Bug#829255: oss4-dkms: Fails to build for 4.6.0-1-amd64
Package: oss4
Version: 4.2-build2010-5
Followup-For: Bug #829255
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve allow this package to build
with v4.6 based kernels:
* d/p/osspci_remove-should-return-void.patch -- correct return from
struct pci_device remove callback. (LP: #1599237)
Thanks.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch
--- oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch 1970-01-01 01:00:00.0 +0100
+++ oss4-4.2-build2010/debian/patches/osspci_remove-should-return-void.patch 2016-07-05 17:08:34.0 +0100
@@ -0,0 +1,36 @@
+Description: osspci_remove should return void
+ The stuct pci_device callback remove should be a void function. This
+ has been true since 2.6.12 but only recently has this become fatal.
+Author: Andy Whitcroft <a...@ubuntu.com>
+---
+
+Index: oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+===
+--- oss4-4.2-build2010.orig/setup/Linux/oss/build/pci_wrapper.inc
oss4-4.2-build2010/setup/Linux/oss/build/pci_wrapper.inc
+@@ -70,9 +70,9 @@ osspci_probe (struct pci_dev *pcidev, co
+ }
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+- static int __devexit
++ static void __devexit
+ #else
+- static int
++ static void
+ #endif
+ osspci_remove (struct pci_dev *pcidev)
+ {
+@@ -87,12 +87,10 @@ osspci_remove (struct pci_dev *pcidev)
+ printk (KERN_ALERT DRIVER_NICK ": Unloading busy device\n");
+ pci_disable_device (dev_map[i].pcidev);
+ osdev_delete (osdev);
+-
+- return 0;
++ return;
+ }
+
+ printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
+- return -EIO;
+ }
+
+ void
diff -Nru oss4-4.2-build2010/debian/patches/series oss4-4.2-build2010/debian/patches/series
--- oss4-4.2-build2010/debian/patches/series 2015-09-26 00:31:01.0 +0100
+++ oss4-4.2-build2010/debian/patches/series 2016-07-05 17:06:41.0 +0100
@@ -19,3 +19,4 @@
#generic_srccconf.patch (seems completely broken to me)
501_linux_version.patch
502_linux_io.patch
+osspci_remove-should-return-void.patch
Bug#829739: blktap-dkms fails to build due to block_device_operations release signature missmatch
Package: blktap-dkms
Version: 2.0.93-0.6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
With later compilers a missmatch between the block_device_operations release
operations definition and the signature of the implementation triggers a build
failure.
We are using the attached patch to resolve this in Ubuntu:
* d/p/follow-block_device_operations-release-return-void.patch -- follow
upstream interface changes in block_device_operations.
Thanks.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru blktap-dkms-2.0.93/debian/patches/follow-block_device_operations-release-return-void.patch blktap-dkms-2.0.93/debian/patches/follow-block_device_operations-release-return-void.patch
--- blktap-dkms-2.0.93/debian/patches/follow-block_device_operations-release-return-void.patch 1970-01-01 01:00:00.0 +0100
+++ blktap-dkms-2.0.93/debian/patches/follow-block_device_operations-release-return-void.patch 2016-07-05 12:52:56.0 +0100
@@ -0,0 +1,40 @@
+Description: follow block_device_operations release return void
+ The return from block_device_operations release became void in 3.10
+ we are now failing to build due due to missmatches of these operations.
+Author: Andy Whitcroft <a...@ubuntu.com>
+---
+
+Index: blktap-dkms-2.0.93/device.c
+===
+--- blktap-dkms-2.0.93.orig/device.c
blktap-dkms-2.0.93/device.c
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "blktap.h"
+
+@@ -50,7 +51,11 @@ blktap_device_open(struct block_device *
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int
++#else
++void
++#endif
+ blktap_device_release(struct gendisk *disk, fmode_t mode)
+ {
+ struct blktap_device *tapdev = disk->private_data;
+@@ -64,7 +69,9 @@ blktap_device_release(struct gendisk *di
+ blktap_ring_kick_user(tap);
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ return 0;
++#endif
+ }
+
+ static int
diff -Nru blktap-dkms-2.0.93/debian/patches/series blktap-dkms-2.0.93/debian/patches/series
--- blktap-dkms-2.0.93/debian/patches/series 2016-03-05 19:42:57.0 +
+++ blktap-dkms-2.0.93/debian/patches/series 2016-07-05 12:29:07.0 +0100
@@ -4,3 +4,4 @@
mempool_resize.patch
disallow_mempools_with_ctor.patch
use-gfpflags_allow_blocking-when-available.patch
+follow-block_device_operations-release-return-void.patch
Bug#869960: rt-tests Recommends: backfire-dkms which is no longer built
Package: rt-tests
Version: 1.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch
Dear Maintainer,
The Recommends: backfire-dkms is holding backfire-dkms in the archive. Noticed
while clean NBS packages on Ubuntu artful.
In Ubuntu, the attached patch was applied to achieve the following:
* debian/control: drop Recommends: backfire-dkms as package has been
removed.
Thanks for considering the patch.
-apw
-- System Information:
Debian Release: stretch/sid
APT prefers artful
APT policy: (500, 'artful')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.11.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru rt-tests-1.0/debian/control rt-tests-1.0/debian/control
--- rt-tests-1.0/debian/control 2017-07-16 21:11:10.0 +0100
+++ rt-tests-1.0/debian/control 2017-07-28 06:56:44.0 +0100
@@ -12,7 +12,6 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
libnuma1 (>= 2.0.3) [amd64 i386 ia64 mips mipsel powerpc]
Conflicts: xenomai-runtime
-Recommends: backfire-dkms
Description: Test programs for rt kernels
rt-tests contains a set of programs that test and measure various components
of real-time kernel behavior, such as timer latency, signal latency and the
