[gnome-build-meta/mcatanzaro/gssproxy-0.9.0] sdk/gssproxy.bst: update to a stable release




commit 30931ea003a1754b49d2ab72afa314cef8a9cdc6
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri May 27 15:43:51 2022 -0500

    sdk/gssproxy.bst: update to a stable release
    
    We had been building a side branch, but now we can use a real release.
    
    With help from Abderrahim, thanks!
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1613>

 elements/sdk/gssproxy.bst      |  8 +++++---
 files/gssproxy/fix-build.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/elements/sdk/gssproxy.bst b/elements/sdk/gssproxy.bst
index b635b5ecd..0fd6b086a 100644
--- a/elements/sdk/gssproxy.bst
+++ b/elements/sdk/gssproxy.bst
@@ -1,9 +1,11 @@
 kind: autotools
 
 sources:
-- kind: git_tag
-  url: github:gssapi/gssproxy.git
-  track: 3d8601e5ed4da42617191976bfd961ead6cab55d
+- kind: tar
+  url: github_files:gssapi/gssproxy/releases/download/v0.9.0/gssproxy-0.9.0.tar.gz
+# When removing this patch, also remove the autoreconf stuff down below.
+- kind: patch
+  path: files/gssproxy/fix-build.patch
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/files/gssproxy/fix-build.patch b/files/gssproxy/fix-build.patch
new file mode 100644
index 000000000..9d5b0a41e
--- /dev/null
+++ b/files/gssproxy/fix-build.patch
@@ -0,0 +1,41 @@
+From 325869a33cb923ab2123ab4179399a37503ed3b5 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo redhat com>
+Date: Tue, 31 May 2022 11:09:14 -0400
+Subject: [PATCH] Move some configure checks out of a condition
+
+I was too aggressive in moving all systemd checks, some of them need to
+be performed at all times because there are conditionals ependent on the
+detection.
+
+The actual build for gss-only module is controlled by the BUILD_PROXY
+guard anyway, so the checking unconditionally should not cause any
+change for that configuration even when unused.
+
+Signed-off-by: Simo Sorce <simo redhat com>
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 483406d..8d881bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,13 +164,13 @@ if test x$only_gss_module != xyes; then
+                          [AC_MSG_ERROR([Could not find libcap headers])])
+     fi
+ 
+-    if test x$initscript = xsystemd; then
+-        WITH_SYSTEMD_UNIT_DIR
+-        WITH_SYSTEMD_USER_UNIT_DIR
+-        AM_CHECK_SYSTEMD
+-    fi
+ fi
+ AM_CONDITIONAL([BUILD_PROXY], [test x$only_gss_module != xyes ])
++if test x$initscript = xsystemd; then
++    WITH_SYSTEMD_UNIT_DIR
++    WITH_SYSTEMD_USER_UNIT_DIR
++fi
++AM_CHECK_SYSTEMD
+ 
+ AC_ARG_ENABLE([always-interpose],
+               [AC_HELP_STRING([--enable-always-interpose],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]