logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

shadow-4.9-libsubid_oot_build.patch (2933B)

    

  1. From 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1 Mon Sep 17 00:00:00 2001
  2. From: Serge Hallyn <serge@hallyn.com>
  3. Date: Fri, 23 Jul 2021 17:51:13 -0500
  4. Subject: [PATCH] Fix out of tree builds with respect to libsubid includes
  6. There's a better way to do this, and I hope to clean that up,
  7. but this fixes out of tree builds for me right now.
  9. Closes #386
  11. Signed-off-by: Serge Hallyn <serge@hallyn.com>
  12. ---
  13.  lib/Makefile.am      | 2 ++
  14.  libmisc/Makefile.am  | 2 +-
  15.  libsubid/Makefile.am | 4 ++--
  16.  src/Makefile.am      | 6 ++++++
  17.  4 files changed, 11 insertions(+), 3 deletions(-)
  19. diff --git a/lib/Makefile.am b/lib/Makefile.am
  20. index ecf3ee25..5ac2e111 100644
  21. --- a/lib/Makefile.am
  22. +++ b/lib/Makefile.am
  23. @@ -10,6 +10,8 @@ if HAVE_VENDORDIR
  24.  libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
  25.  endif
  26.  
  27. +libshadow_la_CPPFLAGS += -I$(top_srcdir)
  28. +
  29.  libshadow_la_SOURCES = \
  30.  	commonio.c \
  31.  	commonio.h \
  32. diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
  33. index 9766a7ec..9f237e0d 100644
  34. --- a/libmisc/Makefile.am
  35. +++ b/libmisc/Makefile.am
  36. @@ -1,7 +1,7 @@
  37.  
  38.  EXTRA_DIST = .indent.pro xgetXXbyYY.c
  39.  
  40. -AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
  41. +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
  42.  
  43.  noinst_LTLIBRARIES = libmisc.la
  44.  
  45. diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
  46. index 83051560..99308c1f 100644
  47. --- a/libsubid/Makefile.am
  48. +++ b/libsubid/Makefile.am
  49. @@ -20,8 +20,8 @@ MISCLIBS = \
  50.  	$(LIBPAM)
  51.  
  52.  libsubid_la_LIBADD = \
  53. -	$(top_srcdir)/lib/libshadow.la \
  54. -	$(top_srcdir)/libmisc/libmisc.la \
  55. +	$(top_builddir)/lib/libshadow.la \
  56. +	$(top_builddir)/libmisc/libmisc.la \
  57.  	$(MISCLIBS) -ldl
  58.  
  59.  AM_CPPFLAGS = \
  60. diff --git a/src/Makefile.am b/src/Makefile.am
  61. index 35027013..7c1a3491 100644
  62. --- a/src/Makefile.am
  63. +++ b/src/Makefile.am
  64. @@ -10,6 +10,7 @@ sgidperms = 2755
  65.  AM_CPPFLAGS = \
  66.  	-I${top_srcdir}/lib \
  67.  	-I$(top_srcdir)/libmisc \
  68. +	-I$(top_srcdir) \
  69.  	-DLOCALEDIR=\"$(datadir)/locale\"
  70.  
  71.  # XXX why are login and su in /bin anyway (other than for
  72. @@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
  73.  list_subid_ranges_CPPFLAGS = \
  74.  	-I$(top_srcdir)/lib \
  75.  	-I$(top_srcdir)/libmisc \
  76. +	-I$(top_srcdir) \
  77.  	-I$(top_srcdir)/libsubid
  78.  
  79.  get_subid_owners_LDADD = \
  80. @@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
  81.  get_subid_owners_CPPFLAGS = \
  82.  	-I$(top_srcdir)/lib \
  83.  	-I$(top_srcdir)/libmisc \
  84. +	-I$(top_srcdir) \
  85.  	-I$(top_srcdir)/libsubid
  86.  
  87.  new_subid_range_CPPFLAGS = \
  88.  	-I$(top_srcdir)/lib \
  89.  	-I$(top_srcdir)/libmisc \
  90. +	-I$(top_srcdir) \
  91.  	-I$(top_srcdir)/libsubid
  92.  
  93.  new_subid_range_LDADD = \
  94. @@ -210,6 +214,7 @@ new_subid_range_LDADD = \
  95.  free_subid_range_CPPFLAGS = \
  96.  	-I$(top_srcdir)/lib \
  97.  	-I$(top_srcdir)/libmisc \
  98. +	-I$(top_srcdir) \
  99.  	-I$(top_srcdir)/libsubid
  100.  
  101.  free_subid_range_LDADD = \
  102. @@ -220,6 +225,7 @@ free_subid_range_LDADD = \
  103.  
  104.  check_subid_range_CPPFLAGS = \
  105.  	-I$(top_srcdir)/lib \
  106. +	-I$(top_srcdir) \
  107.  	-I$(top_srcdir)/libmisc
  108.  
  109.  check_subid_range_LDADD = \