[Forensics-changes] [libbfio] 03/07: Drop patches

Hilko Bengen bengen at moszumanska.debian.org
Tue Jan 24 23:14:07 UTC 2017


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libbfio.

commit 1c63a24022c69c1e74ef64d9896ab6420b80c2ff
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Jan 24 22:29:25 2017 +0100

    Drop patches
---
 debian/patches/01-fix-FTBFS-hurd-386.patch | 85 ------------------------------
 debian/patches/02-fix-FTBFS-GCC5.patch     | 19 -------
 debian/patches/series                      |  2 -
 3 files changed, 106 deletions(-)

diff --git a/debian/patches/01-fix-FTBFS-hurd-386.patch b/debian/patches/01-fix-FTBFS-hurd-386.patch
deleted file mode 100644
index 9963287..0000000
--- a/debian/patches/01-fix-FTBFS-hurd-386.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: libbfio/libcpath/libcpath_path.c
-===================================================================
---- libbfio.orig/libcpath/libcpath_path.c
-+++ libbfio/libcpath/libcpath_path.c
-@@ -484,40 +484,12 @@ int libcpath_path_get_current_working_di
- 
- 		return( -1 );
- 	}
--	*current_working_directory_size = (size_t) PATH_MAX;
--
--	*current_working_directory = libcstring_narrow_string_allocate(
--	                              *current_working_directory_size );
- 
-+	*current_working_directory = getcwd(
-+					    NULL,
-+					    0 );
- 	if( *current_working_directory == NULL )
- 	{
--		libcerror_error_set(
--		 error,
--		 LIBCERROR_ERROR_DOMAIN_MEMORY,
--		 LIBCERROR_MEMORY_ERROR_INSUFFICIENT,
--		 "%s: unable to create current working directory.",
--		 function );
--
--		goto on_error;
--	}
--	if( memory_set(
--	     *current_working_directory,
--	     0,
--	     sizeof( char ) * *current_working_directory_size ) == NULL )
--	{
--		libcerror_error_set(
--		 error,
--		 LIBCERROR_ERROR_DOMAIN_MEMORY,
--		 LIBCERROR_MEMORY_ERROR_SET_FAILED,
--		 "%s: unable to clear current working directory.",
--		 function );
--
--		goto on_error;
--	}
--	if( getcwd(
--	     *current_working_directory,
--	     *current_working_directory_size ) == NULL )
--	{
- 		libcerror_system_set_error(
- 		 error,
- 		 LIBCERROR_ERROR_DOMAIN_RUNTIME,
-@@ -528,6 +500,8 @@ int libcpath_path_get_current_working_di
- 
- 		goto on_error;
- 	}
-+	*current_working_directory_size = 1 + libcstring_narrow_string_length(
-+									      *current_working_directory );
- 	return( 1 );
- 
- on_error:
-@@ -3355,23 +3329,10 @@ int libcpath_path_get_current_working_di
- 
- 		return( -1 );
- 	}
--	narrow_current_working_directory = libcstring_narrow_string_allocate(
--	                                    PATH_MAX );
--
--	if( narrow_current_working_directory == NULL )
--	{
--		libcerror_error_set(
--		 error,
--		 LIBCERROR_ERROR_DOMAIN_MEMORY,
--		 LIBCERROR_MEMORY_ERROR_INSUFFICIENT,
--		 "%s: unable to create narrow current working directory.",
--		 function );
--
--		goto on_error;
--	}
--	if( getcwd(
--	     narrow_current_working_directory,
--	     PATH_MAX ) == NULL )
-+	narrow_current_working_directory = getcwd(
-+						  NULL,
-+						  0 );
-+	if( narrow_current_working_directory == NULL)
- 	{
- 		libcerror_system_set_error(
- 		 error,
diff --git a/debian/patches/02-fix-FTBFS-GCC5.patch b/debian/patches/02-fix-FTBFS-GCC5.patch
deleted file mode 100644
index 1f56e2e..0000000
--- a/debian/patches/02-fix-FTBFS-GCC5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Change libuna to use GNU89 inline semantics for GCC 5
- libuna as written relies on the GNU89 inline semantics. Workaround build
- failure in GCC 5 with the -std=gnu89 option until it is changed upstream.
- For more information see https://gcc.gnu.org/gcc-5/porting_to.html.
-Author: Linn Crosetto <linn at hp.com>
-Bug-Debian: https://bugs.debian.org/777938
-Index: libbfio-20140105/libuna/Makefile.am
-===================================================================
---- libbfio-20140105.orig/libuna/Makefile.am
-+++ libbfio-20140105/libuna/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/common \
- 	@LIBCSTRING_CPPFLAGS@ \
--	@LIBCERROR_CPPFLAGS@
-+	@LIBCERROR_CPPFLAGS@ -std=gnu89
- 
- noinst_LTLIBRARIES = libuna.la
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c5f787a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-fix-FTBFS-hurd-386.patch
-02-fix-FTBFS-GCC5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/libbfio.git



More information about the forensics-changes mailing list