packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debian/patches: remove all patches, no longer needed or applied

This commit is contained in:
Simon McVittie 2016-01-27 15:42:01 +01:00
parent a0354c249d
commit 91bb116275
7 changed files with 1 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ ostree (2016.1-1) UNRELEASED; urgency=medium
* debian/control: remove redundant Section
* debian/control: change Section to admin
* Remove unnecessary uses of dh-exec
* debian/patches: remove all patches, no longer needed or applied
-- Simon McVittie <smcv@debian.org> Wed, 27 Jan 2016 13:04:34 +0100

36
debian/patches/libglnx-user-glibc-attr-support.patch vendored
View File

@ -1,36 +0,0 @@
From d59a63e3e650aa75a055e4ede523790d60645435 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 1 Apr 2015 05:42:26 -0400
Subject: Switch to using glibc xattrs
See https://github.com/GNOME/ostree/pull/78
diff --git a/glnx-fdio.h b/glnx-fdio.h
index 19f938c..5765a02 100644
--- a/libglnx/glnx-fdio.h
+++ b/libglnx/glnx-fdio.h
@@ -25,7 +25,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
/* From systemd/src/shared/util.h */
/* When we include libgen.h because we need dirname() we immediately
* undefine basename() since libgen.h defines it as a macro to the XDG
diff --git a/glnx-xattrs.h b/glnx-xattrs.h
index 410c722..a566a22 100644
--- a/libglnx/glnx-xattrs.h
+++ b/libglnx/glnx-xattrs.h
@@ -25,7 +25,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
G_BEGIN_DECLS
--
cgit v0.10.2

54
debian/patches/ostree-fix-mutable-tree-test-segfault.patch vendored
View File

@ -1,54 +0,0 @@
From d667ebe1568591bdd3c3cc23d751ffc5c0a3752c Mon Sep 17 00:00:00 2001
From: Sam Thursfield <ssssam@gmail.com>
Date: Tue, 31 Mar 2015 12:59:43 -0400
Subject: core: Fix possible crash in ostree_mutable_tree_walk()
If the starting index is beyond the end of the list, it's a programming
error. Previously, the code was trying to raise a runtime error, but
actually causing a segfault.
This was detected by test code in test-mutable-tree.c, which is removed
in this commit because it should now not be possible to crash here.
https://bugzilla.gnome.org/747032
diff --git a/src/libostree/ostree-mutable-tree.c b/src/libostree/ostree-mutable-tree.c
index 26a1ca4..17bcdc9 100644
--- a/src/libostree/ostree-mutable-tree.c
+++ b/src/libostree/ostree-mutable-tree.c
@@ -315,11 +315,9 @@ ostree_mutable_tree_walk (OstreeMutableTree *self,
OstreeMutableTree **out_subdir,
GError **error)
{
- if (start >= split_path->len)
- {
- return set_error_noent (error, (char*)split_path->pdata[start]);
- }
- else if (start == split_path->len - 1)
+ g_return_val_if_fail (start < split_path->len, FALSE);
+
+ if (start == split_path->len - 1)
{
*out_subdir = g_object_ref (self);
return TRUE;
diff --git a/tests/test-mutable-tree.c b/tests/test-mutable-tree.c
index ef2b6b5..b0c2386 100644
--- a/tests/test-mutable-tree.c
+++ b/tests/test-mutable-tree.c
@@ -70,13 +70,6 @@ test_mutable_tree_walk (void)
{
gs_unref_object OstreeMutableTree *subdir = NULL;
- g_assert_false (ostree_mutable_tree_walk (tree, split_path, 10, &subdir, &error));
- g_assert_null (subdir);
- g_clear_error (&error);
- }
-
- {
- gs_unref_object OstreeMutableTree *subdir = NULL;
gs_unref_object OstreeMutableTree *a = NULL;
gs_free char *source_checksum = NULL;
ostree_mutable_tree_lookup (tree, "a", &source_checksum, &a, &error);
--
cgit v0.10.2

15
debian/patches/ostree-link-test-gpg-gpgme.patch vendored
View File

@ -1,15 +0,0 @@
From: David King <dking@redhat.com>
Date: Thu, 2 Apr 2015 13:02:39 +0200
Subject: [PATCH] GPG test needs gpgme to link
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -147,7 +147,7 @@ TESTS_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
src/libostree/ostree-gpg-verify-result-private.h \
tests/test-gpg-verify-result.c
tests_test_gpg_verify_result_CFLAGS = $(TESTS_CFLAGS)
-tests_test_gpg_verify_result_LDADD = $(TESTS_LDADD)
+tests_test_gpg_verify_result_LDADD = $(TESTS_LDADD) $(GPGME_LIBS)
EXTRA_DIST += \
tests/gpg-verify-data/README.md \

22
debian/patches/ostree-link-test-rollsum-libz.patch vendored
View File

@ -1,22 +0,0 @@
From b9fed3d04d5e8cff6f0ad318cc9ab07831af78c0 Mon Sep 17 00:00:00 2001
From: Daniel Svensson <dsvensson@gmail.com>
Date: Wed, 1 Apr 2015 09:38:13 +0200
Subject: [PATCH] test_rollsum needs -lz to link.
---
Makefile-tests.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 675547d..fa35588 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -119,7 +119,7 @@ TESTS_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
tests_test_rollsum_SOURCES = src/libostree/ostree-rollsum.c tests/test-rollsum.c
tests_test_rollsum_CFLAGS = $(TESTS_CFLAGS)
-tests_test_rollsum_LDADD = libbupsplit.la $(TESTS_LDADD)
+tests_test_rollsum_LDADD = libbupsplit.la $(TESTS_LDADD) $(OT_DEP_ZLIB_LIBS)
tests_test_mutable_tree_CFLAGS = $(TESTS_CFLAGS)
tests_test_mutable_tree_LDADD = $(TESTS_LDADD)

64
debian/patches/ostree-use-glibc-attr-support.patch vendored
View File

@ -1,64 +0,0 @@
From 534c4c20c3fa5ad9500ea96093a3ece7821a6056 Mon Sep 17 00:00:00 2001
From: Daniel Svensson <dsvensson@gmail.com>
Date: Wed, 1 Apr 2015 09:45:20 +0200
Subject: build: Use glibc's xattr support instead of requiring libattr
Fixes the build on Debian, and is one library less.
Closes: #78
diff --git a/configure.ac b/configure.ac
index 4042524..e11be41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_ARG_ENABLE(installed_tests,
[enable_installed_tests=no])
AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
-AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from libattr])])
+AC_CHECK_HEADER([sys/xattr.h],,[AC_MSG_ERROR([You must have sys/xattr.h from glibc])])
PKG_PROG_PKG_CONFIG
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index daca66e..22aaf56 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -23,7 +23,7 @@
#include "config.h"
#include <glib-unix.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <gio/gfiledescriptorbased.h>
#include <gio/gunixoutputstream.h>
#include "otutil.h"
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index ce5aa07..6ba606f 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -34,7 +34,7 @@
#include "ostree-checksum-input-stream.h"
#include "ostree-mutable-tree.h"
#include "ostree-varint.h"
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <glib/gprintf.h>
gboolean
diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c
index 7137b82..040636b 100644
--- a/src/libotutil/ot-fs-utils.c
+++ b/src/libotutil/ot-fs-utils.c
@@ -22,7 +22,7 @@
#include "ot-fs-utils.h"
#include "libgsystem.h"
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <gio/gunixinputstream.h>
int
--
cgit v0.10.2

0
debian/patches/series vendored
View File