cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ssh-ldap-helper to 8.0p1

Browse Source 
This is the latest version of this tool, based on what Rocky Linux ships.
Red Hat have deprecated this, but their proposed alternative, SSSD is not
currently viable.

The update is ncessary since the previous version (which wasn't updated
since import in 2012) is based on an ancient SSH version that isn't ready
for opaque libcrypto structs.

Untested, but this has a better chance at working than a package that
doesn't build.

ok landry
This commit is contained in:
tb 2022-01-13 09:49:55 +00:00
parent c9800a05ac
commit 3269717130
4 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
security/ssh-ldap-helper/Makefile
View File

@ -1,37 +1,40 @@
# $OpenBSD: Makefile,v 1.7 2021/01/10 22:34:50 kn Exp $
# $OpenBSD: Makefile,v 1.8 2022/01/13 09:49:55 tb Exp $
COMMENT = fetch ssh AuthorizedKeys from LDAP
DISTNAME = openssh-5.3p1-81
PKGNAME = ssh-ldap-helper-5.3
REVISION = 0
V = 8.0p1
DISTNAME = openssh-${V}-10
PKGNAME = ssh-ldap-helper-8.0
CATEGORIES = security net
EXTRACT_SUFX= .el6.src.rpm
EXTRACT_SUFX= .el8.src.rpm
# BSD
PERMIT_PACKAGE= Yes
WANTLIB += c crypto lber-2.4 ldap-2.4 util z
WANTLIB += c crypto lber ldap util z
MASTER_SITES = http://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/
MASTER_SITES = https://dl.rockylinux.org/pub/rocky/8/BaseOS/source/tree/Packages/o/
PATCH_LIST = ${WRKDIR}/openssh-5.3p1-ldap.patch patch-*
LDAP_PATCH = ${WRKDIR}/openssh-6.7p1-ldap.patch
PATCH_LIST = ${LDAP_PATCH} patch-*
PATCH_STRIP = -p1
WRKDIST = ${WRKDIR}/openssh-5.3p1
WRKDIST = ${WRKDIR}/openssh-${V}
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.62
AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS = --with-ldap=${LOCALBASE} \
--without-pam
NO_TEST = Yes
ALL_TARGET = ssh-ldap-helper
BUILD_DEPENDS= archivers/bzip2
LIB_DEPENDS = databases/openldap
post-extract:
cd ${WRKDIR} && ${TAR} xjf openssh-5.3p1-noacss.tar.bz2
# Fix a 64-bit time_t issue in the LDAP_PATCH
sed -i 's/timeout to %l/&l/' ${LDAP_PATCH}
cd ${WRKDIR} && ${TAR} xzf openssh-${V}.tar.gz
# The LDAP_SET_REBIND_PROC_ARGS macro is set to literal
# "$ac_cv_ldap_set_rebind_proc" instead of "3" because of the improper

4
security/ssh-ldap-helper/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openssh-5.3p1-81.el6.src.rpm) = 9QWDzq8p08r8TG9SrcQ/t1wKqdgcenMKYy3xI4wn2Is=
SIZE (openssh-5.3p1-81.el6.src.rpm) = 1317731
SHA256 (openssh-8.0p1-10.el8.src.rpm) = yT3B6BwP1vrXWNm2WRjwbT6KNG9hWHlGYzgkqjRuiYw=
SIZE (openssh-8.0p1-10.el8.src.rpm) = 2998520

12
security/ssh-ldap-helper/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/11/14 18:42:50 landry Exp $
--- Makefile.in.orig Sun Nov 11 22:35:51 2012
+++ Makefile.in Sun Nov 11 22:35:58 2012
@@ -163,7 +163,7 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysca
$(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
ssh-ldap-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o
- $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck -lldap -llber $(LIBS)
+ $(LD) -o $@ ldapconf.o ldapbody.o ldapmisc.o ldap-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lldap -llber $(LIBS)
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

15
security/ssh-ldap-helper/patches/patch-log_h
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-log_h,v 1.1.1.1 2012/11/14 18:42:50 landry Exp $
--- log.h.orig Sun Nov 11 22:35:23 2012
+++ log.h Sun Nov 11 22:35:33 2012
@@ -14,7 +14,7 @@
$OpenBSD: patch-log_h,v 1.2 2022/01/13 09:49:55 tb Exp $
Index: log.h
--- log.h.orig
+++ log.h
@@ -15,6 +15,9 @@
#ifndef SSH_LOG_H
#define SSH_LOG_H
-
+#include <stdarg.h>
+#include <stdio.h>
+
/* Supported syslog facilities and levels. */
typedef enum {
SYSLOG_FACILITY_DAEMON,