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#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#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#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#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#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-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
