On Thu, May 03, 2007 at 01:48:01PM -0400, Mike Erdely wrote:
> The patch (below) updates sysutils/login_ldap from 3.3 to 3.4. The new
> version allows for adding multiple ldap servers:
> :x-ldap-server=ldap.foo.com,,ssl:\
> :x-ldap-serveralt0=ldap2.foo.com,636,ssl:\
> :x-ldap-serveralt1=localhost,10389:\
> where "alt1" could be connected to using stunnel, if necessary.
Has anyone tested this diff? Success? Problems?
> In correspondence with Peter Werner (previous maintainer), he expressed
> that he's not able to continue to maintain the OpenBSD port, so I can
> take over maintainership.
>
> He also said that he's not able to maintain the code anymore either and
> welcomes someone to take over the development of the login_ldap
> software. At least at this point, this is out of my realm of expertise.
>
> I've tested on many i386 and several sparc64 machines and it works
> great.
>
> Please test.
>
> -ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/login_ldap/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 1 Oct 2005 17:12:30 -0000 1.6
+++ Makefile 3 May 2007 17:45:25 -0000
@@ -2,14 +2,14 @@
COMMENT= "provide ldap authentication type"
-DISTNAME= login_ldap-3.3
-PKGNAME= ${DISTNAME}p0
+DISTNAME= login_ldap-3.4
+PKGNAME= ${DISTNAME}
CATEGORIES= sysutils
-HOMEPAGE= http://www.ifost.org.au/~peterw/
+HOMEPAGE= http://www.yojutsu.org/
MASTER_SITES= ${HOMEPAGE}
-MAINTAINER= Peter Werner <[EMAIL PROTECTED]>
+MAINTAINER= Michael Erdely <[EMAIL PROTECTED]>
# BSD
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/login_ldap/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 5 Apr 2007 17:26:12 -0000 1.5
+++ distinfo 3 May 2007 17:45:25 -0000
@@ -1,5 +1,5 @@
-MD5 (login_ldap-3.3.tar.gz) = UukF1UoTbD2FAVj091SKPw==
-RMD160 (login_ldap-3.3.tar.gz) = nSV0610tEWzlV19Ph0SQLP2hOQE=
-SHA1 (login_ldap-3.3.tar.gz) = oeAVa366IgR+8tcGkTt20GqIQHQ=
-SHA256 (login_ldap-3.3.tar.gz) = 8K04H+q7VkTWXJBTck6XqtZ1JJs6TsxcZknxd9CY1Vw=
-SIZE (login_ldap-3.3.tar.gz) = 10532
+MD5 (login_ldap-3.4.tar.gz) = 1MwWko+4v6qOAZfgqc9MPw==
+RMD160 (login_ldap-3.4.tar.gz) = fM1FaHeBH7nQpKbwuIC8so8eevc=
+SHA1 (login_ldap-3.4.tar.gz) = 3EhA8u1zWJBHITCXvp8ATLKWwnE=
+SHA256 (login_ldap-3.4.tar.gz) = LzQpO/PJf+ClfuSHvkofmUTu0anEOh3mN7VbnVlsSMI=
+SIZE (login_ldap-3.4.tar.gz) = 13560
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 3 May 2007 17:45:25 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- Makefile.orig Thu May 3 12:59:46 2007
++++ Makefile Thu May 3 13:00:45 2007
+@@ -5,7 +5,7 @@ MANDIR=${PREFIX}/man/cat8
+ CPPFLAGS= -I${PREFIX}/include
+ LDFLAGS= -L${PREFIX}/lib
+ AUTHDIR= ${PREFIX}/libexec/auth
+-SHAREDIR=${PREFIX}/share/login_ldap
++SHAREDIR=${PREFIX}/share/examples/login_ldap
+ #port non-suid
+ AUTHINSTALL=install -s -o root -g auth -m 0555
+ EINSTALL=install -o root -g bin -m 755
+@@ -16,7 +16,7 @@ MANDIR=/usr/local/man/cat8
+ CPPFLAGS= -I/usr/include -I/usr/local/include
+ LDFLAGS= -L/usr/local/lib
+ AUTHDIR=/usr/libexec/auth
+-SHAREDIR=/usr/local/share/login_ldap
++SHAREDIR=/usr/local/share/examples/login_ldap
+ AUTHINSTALL=install -s -o root -g auth -m 0555
+
+ .endif
Index: patches/patch-active-directory_login_ldap_conf
===================================================================
RCS file: patches/patch-active-directory_login_ldap_conf
diff -N patches/patch-active-directory_login_ldap_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-active-directory_login_ldap_conf 3 May 2007 17:45:25
-0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- active-directory.login_ldap.conf.orig Thu Mar 23 03:59:48 2006
++++ active-directory.login_ldap.conf Thu May 3 13:41:38 2007
+@@ -1,10 +1,12 @@
+ ldap:\
+ :auth=-ldap:\
+- :x-ldap-server=1.2.3.4:\
+- :x-ldap-port=389:\
++ :x-ldap-server=1.2.3.4,,ssl:\
++ :x-ldap-serveralt0=2.3.4.5:\
++ :x-ldap-cacert=/etc/ssl/ca-ldap.pem:\
+ :x-ldap-noreferrals:\
+- :x-ldap-uscope=subtree:\
++ :x-ldap-uscope=sub:\
+ :x-ldap-basedn=dc=test,dc=de:\
+ :x-ldap-binddn=cn=admin,dc=test,dc=de:\
+ :x-ldap-bindpw=password:\
+ :x-ldap-filter=(&(objectClass=user)(sAMAccountName=%u)):\
++ :tc=default:
Index: patches/patch-login_ldap_8
===================================================================
RCS file: patches/patch-login_ldap_8
diff -N patches/patch-login_ldap_8
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-login_ldap_8 3 May 2007 17:45:25 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- login_ldap.8.orig Mon Apr 17 18:52:04 2006
++++ login_ldap.8 Thu May 3 11:19:35 2007
+@@ -298,10 +298,10 @@ Please contact Raul Aldaz with any issues relating to
+ If you installed this through the ports tree, please be sure to
+ run /usr/local/bin/enable-login_ldap.
+ .Pp
+-As of version 3.4 the default scope is subtree, which is what most
++As of version 3.4 the default scope is sub, which is what most
+ people want.
+ .Pp
+-There have been some significant changes to the login.conf varibales,
++There have been some significant changes to the login.conf variables,
+ in particular how servers are specified.
+ .Pp
+ There is no SASL support. This should be present in the next version,
Index: patches/patch-login_ldap_conf
===================================================================
RCS file: patches/patch-login_ldap_conf
diff -N patches/patch-login_ldap_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-login_ldap_conf 3 May 2007 17:45:25 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- login_ldap.conf.orig Sun Oct 2 20:53:43 2005
++++ login_ldap.conf Thu May 3 13:43:19 2007
+@@ -1,6 +1,7 @@
+ ldap:\
+ :auth=-ldap:\
+ :x-ldap-server=127.0.0.1:\
++ :x-ldap-serveralt0=192.168.0.3,,ssl:\
+ :x-ldap-basedn=ou=users,dc=ifost,dc=org,dc=au:\
+ :x-ldap-filter=(&(objectclass=posixAccount)(uid=%u)):\
+ :tc=default:
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE 3 May 2007 17:45:25 -0000
@@ -0,0 +1,4 @@
+Note: Some configuration options for login_ldap in login.conf have changed.
+If you're upgrading from previous versions, make sure to consult the
+man page, login_ldap(8), and look at the examples in
+${PREFIX}/share/examples/login_ldap/.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/login_ldap/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 1 Oct 2005 17:12:30 -0000 1.6
+++ pkg/PLIST 3 May 2007 17:45:25 -0000
@@ -6,10 +6,10 @@ libexec/auth/login_-ldap
@mode 0555
@owner root
@sample /usr/libexec/auth/login_-ldap
[EMAIL PROTECTED]
@owner
@group
[EMAIL PROTECTED]
@man man/cat8/login_ldap.0
-share/login_ldap/
-share/login_ldap/active-directory.login_ldap.conf
-share/login_ldap/login_ldap.conf
+share/examples/login_ldap/
+share/examples/login_ldap/active-directory.login_ldap.conf
+share/examples/login_ldap/login_ldap.conf
