Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: oss4

oss4 (4.2-build2010-5ubuntu5) focal; urgency=medium * Use M= instead of SUBDIRS= on debian/oss4-dkms.dkms.in (LP: #1848590) -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Thu, 14 Nov 2019 13:11:48 -0300 oss4 (4.2-build2010-5ubuntu4) eoan; urgency=medium * Fix build errors with Linux 5.1+ (LP: #1830056) - debian/patches/510_fix_makedev_build_failure.patch - debian/patches/511_fix_kernel_include_files.patch -- Colin Ian King <colin.king@canonical.com> Thu, 13 Jun 2019 17:28:23 +0100 oss4 (4.2-build2010-5ubuntu3) cosmic; urgency=medium * Fix build error with Linux 4.17 (LP: #1773365) - debian/patches/include_cred.h.patch -- Seth Forshee <seth.forshee@canonical.com> Tue, 12 Jun 2018 08:11:08 -0500 oss4 (4.2-build2010-5ubuntu2) bionic; urgency=medium * Add support for Linux kernel 4.15 (LP: #1737754): - debian/patches/support_for_new_timer_api.patch -- Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Thu, 08 Feb 2018 19:44:22 +0000 oss4 (4.2-build2010-5ubuntu1) yakkety; urgency=low * d/p/osspci_remove-should-return-void.patch -- correct return from struct pci_device remove callback. (LP: #1599237) -- Andy Whitcroft <apw@ubuntu.com> Tue, 05 Jul 2016 17:08:41 +0100

Modifications :
  1. Download patch debian/patches/support_for_new_timer_api.patch

    --- 4.2-build2010-5/debian/patches/support_for_new_timer_api.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/support_for_new_timer_api.patch 2018-02-08 19:23:55.000000000 +0000 @@ -0,0 +1,49 @@ +--- a/setup/Linux/oss/build/osscore.c ++++ b/setup/Linux/oss/build/osscore.c +@@ -492,6 +492,9 @@ + void *arg; + + struct timer_list timer; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ unsigned long id; ++#endif + } tmout_desc_t; + + static volatile int next_id = 0; +@@ -501,10 +504,19 @@ + + int timeout_random = 0x12123400; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++void ++oss_timer_callback (struct timer_list *tl) ++#else + void + oss_timer_callback (unsigned long id) ++#endif + { + tmout_desc_t *tmout; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ tmout = from_timer(tmout, tl, timer); ++ unsigned long id = tmout->id; ++#endif + int ix; + void *arg; + +@@ -562,10 +574,15 @@ + tmout->arg = arg; + tmout->timestamp = id | (timeout_random & ~0xff); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ tmout->id = id | (timeout_random & ~0xff); ++ timer_setup(&tmout->timer, oss_timer_callback, 0); ++#else + init_timer (&tmout->timer); +- tmout->timer.expires = jiffies + ticks; + tmout->timer.data = id | (timeout_random & ~0xff); + tmout->timer.function = oss_timer_callback; ++#endif ++ tmout->timer.expires = jiffies + ticks; + add_timer (&tmout->timer); + + return id | (timeout_random & ~0xff);
  2. Download patch debian/patches/osspci_remove-should-return-void.patch

    --- 4.2-build2010-5/debian/patches/osspci_remove-should-return-void.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/osspci_remove-should-return-void.patch 2016-07-05 16:08:34.000000000 +0000 @@ -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 <apw@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
  3. Download patch debian/patches/511_fix_kernel_include_files.patch

    --- 4.2-build2010-5/debian/patches/511_fix_kernel_include_files.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/511_fix_kernel_include_files.patch 2019-06-13 16:28:23.000000000 +0000 @@ -0,0 +1,72 @@ +Description: fix build errors due to header path issues + The common include files need to be split into kernel or userspace + header includes depending if the code is being build as a kernel + module or as userspace tool. Check for his and include the correct + headers. Also add a header guard to wrap.h to fix a double inclusion + during the module build. + . + Signed-off-by: Colin Ian King <colin.king@canonical.com> +Author: Signed-off-by: Colin Ian King <colin.king@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830056 + +Index: oss4-4.2-build2010/kernel/OS/Linux/os_linux.h +=================================================================== +--- oss4-4.2-build2010.orig/kernel/OS/Linux/os_linux.h ++++ oss4-4.2-build2010/kernel/OS/Linux/os_linux.h +@@ -51,14 +51,23 @@ + + #define __invalid_size_argument_for_IOC 0 /* Dummy define to cure some broken ioctl.h versions */ + ++#if defined(__KERNEL__) ++#include <linux/types.h> ++#include <linux/param.h> ++#include <linux/file.h> ++#include <linux/stat.h> ++#include <linux/fcntl.h> ++#else + #include <sys/types.h> + #include <sys/param.h> +-#include <oss_errno.h> + #include <sys/file.h> +-#include "oss_ddi.h" + #include <sys/stat.h> + #include <sys/fcntl.h> ++#endif ++ + #include <asm/poll.h> ++#include <oss_errno.h> ++#include "oss_ddi.h" + #include "kernel/OS/Linux/wrapper/wrap.h" + + #undef HZ +Index: oss4-4.2-build2010/kernel/OS/Linux/oss_ddi.h +=================================================================== +--- oss4-4.2-build2010.orig/kernel/OS/Linux/oss_ddi.h ++++ oss4-4.2-build2010/kernel/OS/Linux/oss_ddi.h +@@ -32,7 +32,9 @@ typedef int ddi_info_cmd_t; + typedef int ddi_attach_cmd_t; + typedef int ddi_detach_cmd_t; + ++#if !defined(__KERNEL__) + #include <stdint.h> ++#endif + + typedef struct _ddi_dma_attr_t + { +Index: oss4-4.2-build2010/kernel/OS/Linux/wrapper/wrap.h +=================================================================== +--- oss4-4.2-build2010.orig/kernel/OS/Linux/wrapper/wrap.h ++++ oss4-4.2-build2010/kernel/OS/Linux/wrapper/wrap.h +@@ -1,3 +1,6 @@ ++#ifndef _KERNEL_OS_LINUX_WRAPPER_WRAP_H_ ++#define _KERNEL_OS_LINUX_WRAPPER_WRAP_H_ ++ + /* + * Purpose: Wrapper routines for Linux kernel services + * +@@ -280,4 +283,4 @@ extern char *osdev_get_nick (oss_device_ + extern int osdev_get_instance (oss_device_t * osdev); + extern int oss_request_major (oss_device_t * osdev, int major, char *module); + extern int oss_register_device (oss_device_t * osdev, const char *name); /* from oss_config.h */ +- ++#endif
  4. Download patch debian/control

    --- 4.2-build2010-5/debian/control 2016-01-31 12:36:49.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/control 2016-07-05 16:55:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: oss4 Section: sound Priority: optional -Maintainer: Debian OSS4 Maintainers <pkg-oss4-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OSS4 Maintainers <pkg-oss4-maintainers@lists.alioth.debian.org> Uploaders: Sebastien NOEL <sebastien@twolife.org>, Romain Beauxis <toots@rastageeks.org>, Samuel Thibault <sthibault@debian.org>,
  5. Download patch debian/oss4-dkms.dkms.in

    --- 4.2-build2010-5/debian/oss4-dkms.dkms.in 2015-03-09 19:07:55.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/oss4-dkms.dkms.in 2019-11-14 16:11:48.000000000 +0000 @@ -98,9 +98,9 @@ DEST_MODULE_LOCATION[29]="/updates/dkms/ DEST_MODULE_LOCATION[30]="/updates/dkms/" #DEST_MODULE_LOCATION[31]="/updates/dkms/" AUTOINSTALL=yes -MAKE[0]="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules && \ +MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules && \ make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc && \ - make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules" + make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules" CLEAN="cd core && rm -f *.o *.ko *.mod.c *.mod.o .*.cmd modules.order Module.symvers limits.h && rm -rf .tmp_versions && cd .. && \ cd drivers && rm -f *.o *.ko *.mod.c *.mod.o .*.cmd modules.order osscore_symbols.inc && rm -rf .tmp_versions && cd .. "
  6. Download patch debian/patches/series

    --- 4.2-build2010-5/debian/patches/series 2015-09-25 23:31:01.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/series 2019-06-13 16:28:23.000000000 +0000 @@ -19,3 +19,8 @@ #generic_srccconf.patch (seems completely broken to me) 501_linux_version.patch 502_linux_io.patch +osspci_remove-should-return-void.patch +support_for_new_timer_api.patch +include_cred.h.patch +510_fix_makedev_build_failure.patch +511_fix_kernel_include_files.patch
  7. Download patch debian/patches/510_fix_makedev_build_failure.patch

    --- 4.2-build2010-5/debian/patches/510_fix_makedev_build_failure.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/510_fix_makedev_build_failure.patch 2019-06-13 16:28:23.000000000 +0000 @@ -0,0 +1,28 @@ +Description: include sysmacros.h for makedev definition + The makdef function definition is found in sysmacros.h, so include + this to fix a build error. + . + Signed-off-by: Colin Ian King <colin.king@canonical.com> +Author: Signed-off-by: Colin Ian King <colin.king@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830056 + +Index: oss4-4.2-build2010/os_cmd/Linux/ossdetect/ossdetect.c +=================================================================== +--- oss4-4.2-build2010.orig/os_cmd/Linux/ossdetect/ossdetect.c ++++ oss4-4.2-build2010/os_cmd/Linux/ossdetect/ossdetect.c +@@ -13,7 +13,6 @@ + * distribution for the license terms and conditions. + * + */ +- + #include <errno.h> + #include <fcntl.h> + #include <stdio.h> +@@ -23,6 +22,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/dir.h> ++#include <sys/sysmacros.h> + #include <grp.h> + + #define PCI_PASS 0
  8. Download patch debian/patches/include_cred.h.patch

    --- 4.2-build2010-5/debian/patches/include_cred.h.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.2-build2010-5ubuntu5/debian/patches/include_cred.h.patch 2018-06-12 13:11:08.000000000 +0000 @@ -0,0 +1,12 @@ +Index: oss4-4.2-build2010/setup/Linux/oss/build/osscore.c +=================================================================== +--- oss4-4.2-build2010.orig/setup/Linux/oss/build/osscore.c ++++ oss4-4.2-build2010/setup/Linux/oss/build/osscore.c +@@ -31,6 +31,7 @@ typedef int *ioctl_arg; + #include <linux/irq.h> + #include <linux/sched.h> + #include <linux/interrupt.h> ++#include <linux/cred.h> + #undef strlen + #undef strcpy + #define strlen oss_strlen

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: sysvinit

sysvinit (2.96-3ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: - When building for Ubuntu, skip all binaries except for sysvinit-utils. - Make mountpoint.c compile with new glibc. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 May 2020 07:41:28 -0700

Modifications :
  1. Download patch debian/rules

    --- 2.96-3/debian/rules 2020-03-19 22:37:42.000000000 +0000 +++ 2.96-3ubuntu1/debian/rules 2020-05-01 14:41:28.000000000 +0000 @@ -13,6 +13,12 @@ doc = /usr/share/doc LC_ALL = POSIX +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + INSTALL_DATA = install -o root -g root -m 644 INSTALL = install -o root -g root -m 755 @@ -25,6 +31,10 @@ endif DH_OPTIONS = +ifeq ($(shell dpkg-vendor --query vendor),Ubuntu) + DH_OPTIONS = -Nsysvinit-core -Nsysv-rc -Ninitscripts -Nbootlogd +endif + # Use debhelper's dh %: dh $@ $(DH_OPTIONS) @@ -41,6 +51,7 @@ override_dh_auto_install-indep: override_dh_install-arch: dh_install +ifneq (,$(findstring sysvinit-core, $(shell dh_listpackages))) # sysvinit package if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \ then \ @@ -56,6 +67,7 @@ override_dh_install-arch: $(INSTALL_DATA) debian/share/inittab \ $(sysvtmp)/usr/share/sysvinit/inittab ; \ fi +endif # initscripts package may include /sys ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd)) @@ -68,6 +80,7 @@ install-arch: build-arch override_dh_installchangelogs-arch: dh_installchangelogs -psysvinit-core doc/Changelog +ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) dh_installchangelogs -psysvinit-utils sed -i -ne '/sysvinit (2.93-8)/q' -e p \ $(utiltmp)$(doc)/sysvinit-utils/changelog.Debian @@ -75,15 +88,18 @@ override_dh_installchangelogs-arch: dh_installchangelogs -pbootlogd sed -i -ne '/sysvinit (2.93-8)/q' -e p \ $(bootlogdtmp)$(doc)/bootlogd/changelog.Debian +endif override_dh_installchangelogs-indep: dh_installchangelogs +ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) sed -i -ne '/sysvinit (2.93-8)/q' -e p \ $(rctmp)$(doc)/sysv-rc/changelog.Debian dh_installchangelogs -pinitscripts sed -i -ne '/sysvinit (2.93-8)/q' -e p \ $(inittmp)$(doc)/initscripts/changelog.Debian +endif override_dh_installdeb: dh_installdeb
  2. Download patch debian/control

    --- 2.96-3/debian/control 2020-03-19 22:37:42.000000000 +0000 +++ 2.96-3ubuntu1/debian/control 2020-03-20 03:48:10.000000000 +0000 @@ -1,7 +1,8 @@ Source: sysvinit Section: admin Priority: optional -Maintainer: Debian sysvinit maintainers <debian-init-diversity@chiark.greenend.org.uk> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian sysvinit maintainers <debian-init-diversity@chiark.greenend.org.uk> Uploaders: Ian Jackson <ijackson@chiark.greenend.org.uk>, Benda Xu <heroxbd@gentoo.org>,
  3. Download patch debian/patches/series

    --- 2.96-3/debian/patches/series 2020-03-19 22:23:11.000000000 +0000 +++ 2.96-3ubuntu1/debian/patches/series 2020-03-20 03:48:11.000000000 +0000 @@ -1,4 +1,5 @@ 11_run_nologin.patch +fix-glibc.patch 0002-Fix-FTBFS-on-kfreebsd-any.patch 0003-Fix-formatting-of-bootlogd-8.patch 0004-fix-manpage-typo.patch
  4. Download patch debian/patches/fix-glibc.patch

    --- 2.96-3/debian/patches/fix-glibc.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.96-3ubuntu1/debian/patches/fix-glibc.patch 2018-10-04 15:32:29.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Make mountpoint.c compile with new glibc. +Author: Dimitri John Ledkov <xnox@ubuntu.com> + +--- sysvinit-2.88dsf.orig/src/mountpoint.c ++++ sysvinit-2.88dsf/src/mountpoint.c +@@ -23,6 +23,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <unistd.h> + #include <stdlib.h>
  1. oss4
  2. sysvinit