aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--testing/sssd/0001-makefile.patch34
-rw-r--r--testing/sssd/0002-src.patch21
-rw-r--r--testing/sssd/0003-alpine.patch104
-rw-r--r--testing/sssd/APKBUILD17
4 files changed, 90 insertions, 86 deletions
diff --git a/testing/sssd/0001-makefile.patch b/testing/sssd/0001-makefile.patch
index 49c1e55409..67cf3a81fb 100644
--- a/testing/sssd/0001-makefile.patch
+++ b/testing/sssd/0001-makefile.patch
@@ -1,6 +1,8 @@
---- sssd-1.15.3/Makefile.am
-+++ sssd-1.15.3-old/Makefile.am
-@@ -487,6 +487,7 @@
+diff --git a/Makefile.am b/Makefile.am
+index 484b4490e..e3369ae4a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -493,6 +493,7 @@ AM_CPPFLAGS = \
-I$(srcdir)/src/sss_client \
-I$(srcdir)/src \
-I. \
@@ -8,7 +10,7 @@
$(POPT_CFLAGS) \
$(TALLOC_CFLAGS) \
$(TDB_CFLAGS) \
-@@ -891,6 +892,7 @@
+@@ -891,6 +892,7 @@ libsss_child_la_LIBADD = \
$(TEVENT_LIBS) \
$(DHASH_LIBS) \
libsss_debug.la \
@@ -16,15 +18,23 @@
$(NULL)
libsss_child_la_LDFLAGS = -avoid-version
-@@ -1856,6 +1858,7 @@
- $(TALLOC_LIBS) \
+@@ -1727,6 +1729,7 @@ sss_signal_SOURCES = \
+ $(NULL)
+ sss_signal_LDADD = \
+ libsss_debug.la \
++ -lintl \
+ $(NULL)
+
+ sss_override_SOURCES = \
+@@ -1885,6 +1888,7 @@ libsss_test_common_la_LIBADD = \
$(TEVENT_LIBS) \
$(LDB_LIBS) \
+ $(SSSD_INTERNAL_LTLIBS) \
+ -lintl \
$(NULL)
if HAVE_CHECK
-@@ -2511,6 +2514,7 @@
+@@ -2604,6 +2608,7 @@ test_authtok_LDADD = \
$(POPT_LIBS) \
libsss_test_common.la \
libsss_debug.la \
@@ -32,7 +42,7 @@
$(NULL)
sss_nss_idmap_tests_SOURCES = \
-@@ -4053,7 +4057,8 @@
+@@ -4276,7 +4281,8 @@ ldap_child_LDADD = \
$(TALLOC_LIBS) \
$(POPT_LIBS) \
$(DHASH_LIBS) \
@@ -42,11 +52,11 @@
if BUILD_SEMANAGE
selinux_child_SOURCES = \
-@@ -4127,6 +4132,7 @@
+@@ -4367,6 +4373,7 @@ p11_child_LDADD = \
+ $(DHASH_LIBS) \
$(POPT_LIBS) \
- $(NSS_LIBS) \
libsss_crypt.la \
+ -lintl \
$(NULL)
-
- memberof_la_SOURCES = \
+ if HAVE_NSS
+ p11_child_LDADD += \
diff --git a/testing/sssd/0002-src.patch b/testing/sssd/0002-src.patch
index 5e7cbf7625..fbfdb57cc6 100644
--- a/testing/sssd/0002-src.patch
+++ b/testing/sssd/0002-src.patch
@@ -1,6 +1,7 @@
-Only in sssd-1.15.3-old/src/: cifsidmap.h
---- sssd-1.15.3/src/confdb/confdb.h
-+++ sssd-1.15.3-old/src/confdb/confdb.h
+diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
+index 8af625f01..25a959e2b 100644
+--- a/src/confdb/confdb.h
++++ b/src/confdb/confdb.h
@@ -22,6 +22,7 @@
#ifndef _CONF_DB_H
#define _CONF_DB_H
@@ -9,8 +10,10 @@ Only in sssd-1.15.3-old/src/: cifsidmap.h
#include <stdbool.h>
#include <talloc.h>
#include <tevent.h>
---- sssd-1.15.3/src/util/util.h
-+++ sssd-1.15.3-old/src/util/util.h
+diff --git a/src/util/util.h b/src/util/util.h
+index bc89ecbc2..d3f466578 100644
+--- a/src/util/util.h
++++ b/src/util/util.h
@@ -31,6 +31,7 @@
#include <pcre.h>
#include <sys/types.h>
@@ -19,14 +22,14 @@ Only in sssd-1.15.3-old/src/: cifsidmap.h
#include <netinet/in.h>
#include <talloc.h>
-@@ -44,6 +45,10 @@
- #include "util/util_safealign.h"
+@@ -46,6 +47,10 @@
#include "util/sss_format.h"
#include "util/debug.h"
-+
+
+#ifndef ALLPERMS
+#define ALLPERMS (S_ISUID | S_ISGID | S_IRGRP | S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
-
++
/* name of the monitor server instance */
#define SSSD_PIDFILE PID_PATH"/sssd.pid"
+ #define MAX_PID_LENGTH 10
diff --git a/testing/sssd/0003-alpine.patch b/testing/sssd/0003-alpine.patch
index 043975d579..d040bde1dc 100644
--- a/testing/sssd/0003-alpine.patch
+++ b/testing/sssd/0003-alpine.patch
@@ -1,5 +1,43 @@
---- sssd-1.15.3/src/external/platform.m4
-+++ sssd-1.15.3-old/src/external/platform.m4
+diff --git a/Makefile.am b/Makefile.am
+index 426a62b29..5899cddbe 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4685,13 +4685,17 @@ else
+ if HAVE_GENTOO
+ init_SCRIPTS += \
+ src/sysv/gentoo/sssd
++else
++if HAVE_ALPINE
++ init_SCRIPTS += \
++ src/sysv/alpine/sssd
+ else
+ init_SCRIPTS += \
+ src/sysv/sssd
+ endif
+ endif
+ endif
+-
++endif
+
+ dist_sssddata_DATA = \
+ src/config/etc/sssd.api.conf \
+diff --git a/configure.ac b/configure.ac
+index 9df463d9c..7d8c436ed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -505,7 +505,7 @@ AC_DEFINE_UNQUOTED([ABS_SRC_DIR], ["$my_srcdir"], [Absolute path to the source d
+
+ AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
+ contrib/sssd-pcsc.rules
+- src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd
++ src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd src/sysv/alpine/sssd
+ po/Makefile.in src/man/Makefile src/tests/cwrap/Makefile
+ src/tests/intg/Makefile src/tests/test_CA/Makefile
+ src/lib/ipa_hbac/ipa_hbac.pc src/lib/ipa_hbac/ipa_hbac.doxy
+diff --git a/src/external/platform.m4 b/src/external/platform.m4
+index c67e08144..a1bb8cdaa 100644
+--- a/src/external/platform.m4
++++ b/src/external/platform.m4
@@ -1,5 +1,5 @@
AC_ARG_WITH([os],
- [AC_HELP_STRING([--with-os=OS_TYPE], [Type of your operation system (fedora|redhat|suse|gentoo)])]
@@ -7,7 +45,7 @@
)
osname=""
if test x"$with_os" != x ; then
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,7 @@ if test x"$with_os" != x ; then
test x"$with_os" = xredhat || \
test x"$with_os" = xsuse || \
test x"$with_os" = xgentoo || \
@@ -15,7 +53,7 @@
test x"$with_os" = xdebian ; then
osname=$with_os
else
-@@ -25,6 +26,8 @@
+@@ -25,6 +26,8 @@ if test x"$osname" = x ; then
osname="debian"
elif test -f /etc/gentoo-release ; then
osname="gentoo"
@@ -24,7 +62,7 @@
fi
AC_MSG_NOTICE([Detected operating system type: $osname])
-@@ -35,6 +38,7 @@
+@@ -35,6 +38,7 @@ AM_CONDITIONAL([HAVE_REDHAT], [test x"$osname" = xredhat])
AM_CONDITIONAL([HAVE_SUSE], [test x"$osname" = xsuse])
AM_CONDITIONAL([HAVE_DEBIAN], [test x"$osname" = xdebian])
AM_CONDITIONAL([HAVE_GENTOO], [test x"$osname" = xgentoo])
@@ -32,59 +70,11 @@
AC_CHECK_MEMBERS([struct ucred.pid, struct ucred.uid, struct ucred.gid], , ,
[[#include <sys/socket.h>]])
---- sssd-1.15.3/Makefile.am
-+++ sssd-1.15.3-old/Makefile.am
-@@ -4423,12 +4419,16 @@
- init_SCRIPTS += \
- src/sysv/gentoo/sssd
- else
-+if HAVE_ALPINE
- init_SCRIPTS += \
-+ src/sysv/alpine/sssd
-+else
-+ init_SCRIPTS += \
- src/sysv/sssd
- endif
- endif
- endif
--
-+endif
-
- dist_sssddata_DATA = \
- src/config/etc/sssd.api.conf \
---- sssd-1.15.3-old/configure.ac
-+++ sssd-1.15.3/configure.ac
-@@ -491,7 +491,7 @@
-
- AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
- contrib/sssd-pcsc.rules
-- src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd
-+ src/sysv/sssd src/sysv/gentoo/sssd src/sysv/SUSE/sssd src/sysv/alpine/sssd
- po/Makefile.in src/man/Makefile src/tests/cwrap/Makefile
- src/tests/intg/Makefile
- src/lib/ipa_hbac/ipa_hbac.pc src/lib/ipa_hbac/ipa_hbac.doxy
---- /dev/null
-+++ sssd-1.15.3/src/sysv/alpine/sssd
-@@ -0,0 +1,17 @@
-+#!/sbin/openrc-run
-+
-+depend(){
-+ need localmount netmount clock
-+}
-+
-+start(){
-+ ebegin "Starting sssd"
-+ start-stop-daemon --start --exec ${exec_prefix}/usr/sbin/sssd -- -Df ${SSSD_OPTIONS}
-+ eend ${?}
-+}
-+
-+stop(){
-+ ebegin "Stopping sssd"
-+ start-stop-daemon --stop --pidfile ${prefix}/var/run/sssd.pid
-+ eend ${?}
-+}
+diff --git a/src/sysv/alpine/sssd.in b/src/sysv/alpine/sssd.in
+new file mode 100644
+index 000000000..597bf8ce9
--- /dev/null
-+++ sssd-1.15.3/src/sysv/alpine/sssd.in
++++ b/src/sysv/alpine/sssd.in
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
diff --git a/testing/sssd/APKBUILD b/testing/sssd/APKBUILD
index b0ca15151a..fc0f7fa576 100644
--- a/testing/sssd/APKBUILD
+++ b/testing/sssd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Vince Mele <vmele@inoc.com>
# Maintainer: Vince Mele <vmele@inoc.com>
pkgname=sssd
-pkgver=1.15.3
-pkgrel=1
+pkgver=1.16.3
+pkgrel=0
pkgdesc="System Security Services Daemon"
url="https://pagure.io/SSSD/sssd"
arch="x86_64"
@@ -72,7 +72,6 @@ build() {
cd "$builddir"
./configure \
--prefix=/usr \
- --exec-prefix=/usr/sbin \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -90,7 +89,9 @@ build() {
--without-samba \
--without-nfsv4-idmapd-plugin \
--without-manpages \
- --disable-cifs-idmap-plugin
+ --disable-cifs-idmap-plugin \
+ --disable-static \
+ --disable-rpath
make
}
@@ -116,9 +117,9 @@ package() {
rm -rf "$pkgdir"/usr/lib/ldb/modules/ldb/memberof.la
}
-sha512sums="92478205ee1b1cebc3d35b733576180db51cee8cc84d0c2cb78386924ffa90ae355b6ad9b7b51e5e5f5a7a4588764d1c7afb0673c035b1fe9b1a283beb79a428 sssd-1.15.3.tar.gz
-d0f30b6a372d3ca9705e9621f6bc4dc473a381a719b2158ad66195d0037ae1661d2832c3ec7755e200070b8de2e0ddbf77da36d2f25bcfa6e0e352d08662db37 0001-makefile.patch
-70284f0820e958c1c091d554cb2dd302f210935fb191deb71af510c52c402d52298143e05dfa161eecf89885d3c2569a4a0c536480971becd4d50a7d5adf3ffa 0002-src.patch
-300c1f6750054f61201e0952642f533aa5f572c208fc4f8317b89ec6731734680bf771bd37664e5f907fb30a713ace4b26aad9b6da2245a5cc10f9f0af878246 0003-alpine.patch
+sha512sums="6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728 sssd-1.16.3.tar.gz
+a330383e7a334db47baf3f42cbb487c4875894e2120f55e71e2846d3d835ad9702137c93a4d233a237b944fb17410ed90b7fa374126f70db77259c0b83741ebc 0001-makefile.patch
+573b6ce0eb8ac7b819a895e32f5feb1150f60c4e6ce45c3262b5af862245c968c85f4eef8b62b0e56c8ef12ca5742f368ee12b794942aeabf2bf32d1bf18bd53 0002-src.patch
+1ec5048cbb0e184ca52e970b1a0bb0f69aeb647edfcf25610e51ff54e45e77e93a19c2cf22e12a768a474eba7eed8d9a41f7cfd2cbd0ba1495c1002170e77765 0003-alpine.patch
5abb1ffd1302eaa25736404ae148c0ffdeb7ce42fa2745be3436e887a2aa96b9620287f19b2790cb59cbccc2c04a9dee1adec4fa8e813d322cde82793500e33b nss.h
b88d4f1ba847477783b43542f1248881d4fb8e8a0d4165c65c358fcb442891d2cc7c96b05e2a8e7c05fdc17ecd76f16295c1ffac3f1c9bfd0375c5e65e56201d cifsidmap.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 17:15:22 +0000