1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## try_libhpmud.so.0.dpatch by <evgeni@debian.org>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Try libhpmud.so.0 after libhpmud.so
9 diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c
10 index c36caa7..465342e 100644
11 --- a/scan/sane/marvell.c
12 +++ b/scan/sane/marvell.c
13 @@ -63,8 +63,11 @@ static int bb_load(struct marvell_session *ps, const char *so)
14 /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
15 if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
17 - BUG("unable to load restricted library: %s\n", dlerror());
19 + if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
21 + BUG("unable to load restricted library: %s\n", dlerror());
26 /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */
27 diff --git a/scan/sane/soap.c b/scan/sane/soap.c
28 index 28b83cc..698f58c 100644
29 --- a/scan/sane/soap.c
30 +++ b/scan/sane/soap.c
31 @@ -71,8 +71,11 @@ static int bb_load(struct soap_session *ps, const char *so)
32 /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
33 if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
35 - BUG("unable to load restricted library: %s\n", dlerror());
37 + if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
39 + BUG("unable to load restricted library: %s\n", dlerror());
44 /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */
45 diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c
46 index 5535245..e6039c1 100644
47 --- a/scan/sane/soapht.c
48 +++ b/scan/sane/soapht.c
49 @@ -62,10 +62,13 @@ static int bb_load(struct soap_session *ps, const char *so)
52 /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
53 - if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
54 + if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
56 - BUG("unable to load restricted library: %s\n", dlerror());
58 + if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
60 + BUG("unable to load restricted library: %s\n", dlerror());
65 /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */