security/sssd2: Final round of cleanups

- Trim configure options - Remove unused variables - Fix DATADIR Sponsored by: Future Crew, LLC
freebsd · Oct 6, 2024 · 7897c7d · 7897c7d
1 parent c869ea4
commit 7897c7d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 45 deletions.
diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile
@@ -61,10 +61,7 @@ INSTALL_TARGET=	install-strip
 CPE_VENDOR=	fedoraproject
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
-		--datadir=${DATADIR} \
-		--docdir=${DOCSDIR} \
 		--localstatedir=/var \
-		--disable-silent-rules \
 		--disable-nls \
 		--disable-cifs-idmap-plugin \
 		--disable-valgrind \
@@ -95,42 +92,24 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--without-autofs \
 		--with-files-provider \
 		--with-passkey \
-		--with-libsifp \
-		--without-libsifp \
-		--with-syslog=syslog \
 		--with-samba \
 		--without-nfsv4-idmapd-plugin \
-		--with-nfs-lib-path=${LOCALBASE}/lib \
 		--with-secrets-db-path=/var/lib/sss/secrets \
 		--with-kcm \
 		--with-oidc-child \
 		--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \
 		--with-smb-idmap-interface-version=6 \
 		--without-libnl \
 		--with-nscd-conf=/etc/nscd.conf \
-		--with-python_prefix=${PREFIX} \
-		--with-unicode-lib=libunistring
+		--with-python_prefix=${PREFIX}
 CONFIGURE_ENV=	KRB5_CONFIG="${KRB5CONFIG}"
 
 CPPFLAGS+=	-DRENEWAL_PROG_PATH='\"${LOCALBASE}/sbin/adcli\"'
 CFLAGS+=	-fstack-protector-all
-CFLAGS+=	-I${LOCALBASE}/include/samba4
-
-LIBS+=	-L${LOCALBASE}/lib \
-	-L${LOCALBASE}/lib/samba4/private \
-	-L${LOCALBASE}/lib/sasl2  \
-	-linotify -lintl
-
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-MAKE_ENV=	MAKELEVEL=0
+LIBS+=		-linotify -lintl
 
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
-MAKE_ENV+=	LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW"
+MAKE_ENV=	MAKELEVEL=0 LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW"
 SUB_FILES=	pkg-message
 
 BINARY_ALIAS=	python3=python${PYTHON_VER}
@@ -173,12 +152,6 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \
 		${STAGEDIR}${ETCDIR}/sssd.conf.sample
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system.d
-	${INSTALL_DATA} ${WRKSRC}/src/responder/ifp/org.freedesktop.sssd.infopipe.conf \
-		${STAGEDIR}${PREFIX}/share/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
-	${INSTALL_DATA} ${WRKSRC}/src/responder/ifp/org.freedesktop.sssd.infopipe.service \
-		${STAGEDIR}${PREFIX}/share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
 	${LN} -sf libnss_sss.so.2 ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1
 
 .include <bsd.port.mk>
diff --git a/security/sssd2/pkg-plist b/security/sssd2/pkg-plist
@@ -131,21 +131,19 @@ share/man/man8/sssd-kcm.8.gz
 share/man/man8/sssd.8.gz
 share/man/man8/sssd_krb5_localauth_plugin.8.gz
 share/man/man8/sssd_krb5_locator_plugin.8.gz
-%%DATADIR%%/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
-%%DATADIR%%/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
-%%DATADIR%%/sssd-kcm/kcm_default_ccache
-%%DATADIR%%/sssd/cfg_rules.ini
-%%DATADIR%%/sssd/krb5-snippets/enable_sssd_conf_dir
-%%DATADIR%%/sssd/krb5-snippets/sssd_enable_idp
-%%DATADIR%%/sssd/krb5-snippets/sssd_enable_passkey
-%%DATADIR%%/sssd/sssd.api.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-ad.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-files.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-ipa.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-krb5.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-ldap.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-proxy.conf
-%%DATADIR%%/sssd/sssd.api.d/sssd-simple.conf
+share/sssd-kcm/kcm_default_ccache
+%%DATADIR%%/cfg_rules.ini
+%%DATADIR%%/krb5-snippets/enable_sssd_conf_dir
+%%DATADIR%%/krb5-snippets/sssd_enable_idp
+%%DATADIR%%/krb5-snippets/sssd_enable_passkey
+%%DATADIR%%/sssd.api.conf
+%%DATADIR%%/sssd.api.d/sssd-ad.conf
+%%DATADIR%%/sssd.api.d/sssd-files.conf
+%%DATADIR%%/sssd.api.d/sssd-ipa.conf
+%%DATADIR%%/sssd.api.d/sssd-krb5.conf
+%%DATADIR%%/sssd.api.d/sssd-ldap.conf
+%%DATADIR%%/sssd.api.d/sssd-proxy.conf
+%%DATADIR%%/sssd.api.d/sssd-simple.conf
 @dir %%ETCDIR%%/conf.d
 @dir %%ETCDIR%%/pki
 @dir lib/ldb