Package: libvformat
Version: 1.13-12.1
Followup-For: Bug #1066065
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch

Please find the fix for this attached.

As this is fallout from the time_t transition, I am uploading this as a 0-day
NMU.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru libvformat-1.13/debian/control libvformat-1.13/debian/control
--- libvformat-1.13/debian/control      2024-03-31 12:51:42.000000000 -0700
+++ libvformat-1.13/debian/control      2024-04-07 01:00:50.000000000 -0700
@@ -1,8 +1,7 @@
 Source: libvformat
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Thomas Preud'homme <robo...@debian.org>
+Maintainer: Thomas Preud'homme <robo...@debian.org>
 Standards-Version: 4.5.0
 Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), texinfo, 
automake, autoconf, libtool
 Build-Conflicts: autoconf2.13, automake1.4
diff -Nru libvformat-1.13/debian/patches/no-implicit-declarations.patch 
libvformat-1.13/debian/patches/no-implicit-declarations.patch
--- libvformat-1.13/debian/patches/no-implicit-declarations.patch       
1969-12-31 16:00:00.000000000 -0800
+++ libvformat-1.13/debian/patches/no-implicit-declarations.patch       
2024-04-07 00:59:05.000000000 -0700
@@ -0,0 +1,43 @@
+Description: fix missing unistd.h include
+ src/vf_reader.c includes unistd.h conditionally, but the condition
+ doesn't properly match what's emitted by autoconf.  Fix the #if so we
+ get a declaration for read().
+Author: Steve Langasek <steve.langa...@canonical.com>
+Last-Update: 2024-04-07
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/1066065
+
+Index: libvformat-1.13/src/vf_reader.c
+===================================================================
+--- libvformat-1.13.orig/src/vf_reader.c
++++ libvformat-1.13/src/vf_reader.c
+@@ -85,10 +85,12 @@
+  
*=============================================================================*/
+ 
+ 
++#include "config.h"
++
+ #include <stdio.h>
+ #include <sys/stat.h>
+ 
+-#if defined(HAS_UNISTD_H)
++#if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
+ 
+Index: libvformat-1.13/test/testsuppt.c
+===================================================================
+--- libvformat-1.13.orig/test/testsuppt.c
++++ libvformat-1.13/test/testsuppt.c
+@@ -51,9 +51,10 @@
+ 
/*============================================================================*
+  ANSI C & System-wide Header Files
+  
*============================================================================*/
++#include "config.h"
+ 
+ #include <stdlib.h>
+-#if defined(HAS_UNISTD_H)
++#if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
+ #include <stdio.h>
diff -Nru libvformat-1.13/debian/patches/series 
libvformat-1.13/debian/patches/series
--- libvformat-1.13/debian/patches/series       2020-08-10 14:55:14.000000000 
-0700
+++ libvformat-1.13/debian/patches/series       2024-04-07 00:50:34.000000000 
-0700
@@ -9,3 +9,4 @@
 0009-Fix-errors-returned-by-Werror-format-security.patch
 0010-Fix-typos-in-man-pages.patch
 auto-gitignore
+no-implicit-declarations.patch

Reply via email to