commit 99eec294298ae4899597b63fd815b59fb7179ac5 Author: Juergen Daubert <jue@jue.li> Date: Wed Mar 16 15:24:04 2022 +0100 openldap: update to 2.6.1 diff --git a/openldap/.footprint b/openldap/.footprint index e1b9441c7..346d83a4a 100644 --- a/openldap/.footprint +++ b/openldap/.footprint @@ -1,6 +1,5 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/openldap/ --rw------- root/root etc/openldap/DB_CONFIG.example -rw-r--r-- root/root etc/openldap/ldap.conf -rw-r--r-- root/root etc/openldap/ldap.conf.default drwxr-xr-x root/root etc/openldap/schema/ @@ -12,6 +11,8 @@ drwxr-xr-x root/root etc/openldap/schema/ -r--r--r-- root/root etc/openldap/schema/core.schema -r--r--r-- root/root etc/openldap/schema/cosine.ldif -r--r--r-- root/root etc/openldap/schema/cosine.schema +-r--r--r-- root/root etc/openldap/schema/dsee.ldif +-r--r--r-- root/root etc/openldap/schema/dsee.schema -r--r--r-- root/root etc/openldap/schema/duaconf.ldif -r--r--r-- root/root etc/openldap/schema/duaconf.schema -r--r--r-- root/root etc/openldap/schema/dyngroup.ldif @@ -22,14 +23,16 @@ drwxr-xr-x root/root etc/openldap/schema/ -r--r--r-- root/root etc/openldap/schema/java.schema -r--r--r-- root/root etc/openldap/schema/misc.ldif -r--r--r-- root/root etc/openldap/schema/misc.schema +-r--r--r-- root/root etc/openldap/schema/msuser.ldif +-r--r--r-- root/root etc/openldap/schema/msuser.schema +-r--r--r-- root/root etc/openldap/schema/namedobject.ldif +-r--r--r-- root/root etc/openldap/schema/namedobject.schema -r--r--r-- root/root etc/openldap/schema/nis.ldif -r--r--r-- root/root etc/openldap/schema/nis.schema -r--r--r-- root/root etc/openldap/schema/openldap.ldif -r--r--r-- root/root etc/openldap/schema/openldap.schema -r--r--r-- root/root etc/openldap/schema/pmi.ldif -r--r--r-- root/root etc/openldap/schema/pmi.schema --r--r--r-- root/root etc/openldap/schema/ppolicy.ldif --r--r--r-- root/root etc/openldap/schema/ppolicy.schema -rw------- root/root etc/openldap/slapd.conf -rw------- root/root etc/openldap/slapd.conf.default -rw------- root/root etc/openldap/slapd.ldif @@ -47,6 +50,7 @@ lrwxrwxrwx root/root usr/bin/ldapadd -> ldapmodify -rwxr-xr-x root/root usr/bin/ldappasswd -rwxr-xr-x root/root usr/bin/ldapsearch -rwxr-xr-x root/root usr/bin/ldapurl +-rwxr-xr-x root/root usr/bin/ldapvc -rwxr-xr-x root/root usr/bin/ldapwhoami drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lber.h @@ -60,24 +64,20 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/openldap.h -rw-r--r-- root/root usr/include/slapi-plugin.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.11.7 --rw-r--r-- root/root usr/lib/liblber-2.4.so.2.11.7 -rw-r--r-- root/root usr/lib/liblber.a -rw-r--r-- root/root usr/lib/liblber.la -lrwxrwxrwx root/root usr/lib/liblber.so -> liblber-2.4.so.2.11.7 +lrwxrwxrwx root/root usr/lib/liblber.so -> liblber.so.2.0.200 lrwxrwxrwx root/root usr/lib/liblber.so.2 -> liblber.so -lrwxrwxrwx root/root usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.11.7 --rw-r--r-- root/root usr/lib/libldap-2.4.so.2.11.7 +-rw-r--r-- root/root usr/lib/liblber.so.2.0.200 -rw-r--r-- root/root usr/lib/libldap.a -rw-r--r-- root/root usr/lib/libldap.la -lrwxrwxrwx root/root usr/lib/libldap.so -> libldap-2.4.so.2.11.7 +lrwxrwxrwx root/root usr/lib/libldap.so -> libldap.so.2.0.200 lrwxrwxrwx root/root usr/lib/libldap.so.2 -> libldap.so -lrwxrwxrwx root/root usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.11.7 --rw-r--r-- root/root usr/lib/libldap_r-2.4.so.2.11.7 --rw-r--r-- root/root usr/lib/libldap_r.a --rw-r--r-- root/root usr/lib/libldap_r.la -lrwxrwxrwx root/root usr/lib/libldap_r.so -> libldap_r-2.4.so.2.11.7 +-rw-r--r-- root/root usr/lib/libldap.so.2.0.200 lrwxrwxrwx root/root usr/lib/libldap_r.so.2 -> libldap_r.so +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/lber.pc +-rw-r--r-- root/root usr/lib/pkgconfig/ldap.pc drwxr-xr-x root/root usr/sbin/ lrwxrwxrwx root/root usr/sbin/slapacl -> slapd lrwxrwxrwx root/root usr/sbin/slapadd -> slapd @@ -86,6 +86,7 @@ lrwxrwxrwx root/root usr/sbin/slapcat -> slapd -rwxr-xr-x root/root usr/sbin/slapd lrwxrwxrwx root/root usr/sbin/slapdn -> slapd lrwxrwxrwx root/root usr/sbin/slapindex -> slapd +lrwxrwxrwx root/root usr/sbin/slapmodify -> slapd lrwxrwxrwx root/root usr/sbin/slappasswd -> slapd lrwxrwxrwx root/root usr/sbin/slapschema -> slapd lrwxrwxrwx root/root usr/sbin/slaptest -> slapd @@ -101,6 +102,7 @@ lrwxrwxrwx root/root usr/share/man/man1/ldapadd.1.gz -> ldapmodify.1.gz -rw-r--r-- root/root usr/share/man/man1/ldappasswd.1.gz -rw-r--r-- root/root usr/share/man/man1/ldapsearch.1.gz -rw-r--r-- root/root usr/share/man/man1/ldapurl.1.gz +-rw-r--r-- root/root usr/share/man/man1/ldapvc.1.gz -rw-r--r-- root/root usr/share/man/man1/ldapwhoami.1.gz drwxr-xr-x root/root usr/share/man/man3/ lrwxrwxrwx root/root usr/share/man/man3/ber_alloc_t.3.gz -> lber-encode.3.gz @@ -196,6 +198,7 @@ lrwxrwxrwx root/root usr/share/man/man3/ldap_extended_operation_s.3.gz -> ldap_e -rw-r--r-- root/root usr/share/man/man3/ldap_first_message.3.gz -rw-r--r-- root/root usr/share/man/man3/ldap_first_reference.3.gz lrwxrwxrwx root/root usr/share/man/man3/ldap_free_urldesc.3.gz -> ldap_url.3.gz +lrwxrwxrwx root/root usr/share/man/man3/ldap_get_attribute_ber.3.gz -> ldap_first_attribute.3.gz -rw-r--r-- root/root usr/share/man/man3/ldap_get_dn.3.gz -rw-r--r-- root/root usr/share/man/man3/ldap_get_option.3.gz -rw-r--r-- root/root usr/share/man/man3/ldap_get_values.3.gz @@ -289,23 +292,22 @@ lrwxrwxrwx root/root usr/share/man/man3/ldap_value_free_len.3.gz -> ldap_get_val drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/ldap.conf.5.gz -rw-r--r-- root/root usr/share/man/man5/ldif.5.gz --rw-r--r-- root/root usr/share/man/man5/slapd-bdb.5.gz +-rw-r--r-- root/root usr/share/man/man5/lloadd.conf.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapd-asyncmeta.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-config.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-dnssrv.5.gz -lrwxrwxrwx root/root usr/share/man/man5/slapd-hdb.5.gz -> slapd-bdb.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-ldap.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-ldif.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-mdb.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-meta.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-monitor.5.gz --rw-r--r-- root/root usr/share/man/man5/slapd-ndb.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-null.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-passwd.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-perl.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-relay.5.gz --rw-r--r-- root/root usr/share/man/man5/slapd-shell.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-sock.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd-sql.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapd-wt.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd.access.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd.backends.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd.conf.5.gz @@ -313,17 +315,22 @@ lrwxrwxrwx root/root usr/share/man/man5/slapd-hdb.5.gz -> slapd-bdb.5.gz -rw-r--r-- root/root usr/share/man/man5/slapd.plugin.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-accesslog.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-auditlog.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapo-autoca.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-chain.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-collect.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-constraint.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-dds.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapo-deref.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-dyngroup.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-dynlist.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapo-homedir.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-memberof.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapo-otp.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-pbind.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-pcache.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-ppolicy.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-refint.5.gz +-rw-r--r-- root/root usr/share/man/man5/slapo-remoteauth.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-retcode.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-rwm.5.gz lrwxrwxrwx root/root usr/share/man/man5/slapo-sock.5.gz -> slapd-sock.5.gz @@ -332,7 +339,9 @@ lrwxrwxrwx root/root usr/share/man/man5/slapo-sock.5.gz -> slapd-sock.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-translucent.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-unique.5.gz -rw-r--r-- root/root usr/share/man/man5/slapo-valsort.5.gz +-rw-r--r-- root/root usr/share/man/man5/slappw-argon2.5.gz drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/lloadd.8.gz -rw-r--r-- root/root usr/share/man/man8/slapacl.8.gz -rw-r--r-- root/root usr/share/man/man8/slapadd.8.gz -rw-r--r-- root/root usr/share/man/man8/slapauth.8.gz @@ -340,11 +349,10 @@ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/slapd.8.gz -rw-r--r-- root/root usr/share/man/man8/slapdn.8.gz -rw-r--r-- root/root usr/share/man/man8/slapindex.8.gz +-rw-r--r-- root/root usr/share/man/man8/slapmodify.8.gz -rw-r--r-- root/root usr/share/man/man8/slappasswd.8.gz -rw-r--r-- root/root usr/share/man/man8/slapschema.8.gz -rw-r--r-- root/root usr/share/man/man8/slaptest.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/openldap/ -drwxr-xr-x root/root var/openldap/openldap-data/ --rw------- root/root var/openldap/openldap-data/DB_CONFIG.example drwxr-xr-x root/root var/openldap/run/ diff --git a/openldap/.signature b/openldap/.signature index 4956463a1..11b5c3d11 100644 --- a/openldap/.signature +++ b/openldap/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XHosIK3KgHSEt8XgSY4iZ1bZu0K1Ujblpc7p+o9SUirnVZTQgHNqx5oSZeBFrtkK8eOZMvwCHbdhQPUDEJdJgw= -SHA256 (Pkgfile) = 1608d0ee6d2cd9a37354fe585aba644289fc43f6ee48f3e7b638b245d0a24274 -SHA256 (.footprint) = 2d288ad645574783190d490ba97616db4b619378da1846ee838562db3acc27e5 -SHA256 (openldap-2.4.59.tgz) = 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 -SHA256 (openldap-config.patch) = 4cc73b3acb468926f372b34e83ce9905ea026377b76cb5412d62ed4f483ff20c +RWSE3ohX2g5d/RDKvk3u/X/83cbw/UYuMqLs7+q0QqgVR+EDmgO9m22N+7q9lWh9oICD4vzezblsfiL++E92tsjGDiP4xKI81Qc= +SHA256 (Pkgfile) = b7c8d08dddfca78c49458734db2c860e17e12f2097eaf88a141dca336fa03e9c +SHA256 (.footprint) = 7ab74217fe99f7acf9549d93b691f2ca0e7a091e418048ae7a8bdcc051870878 +SHA256 (openldap-2.6.1.tgz) = 9d576ea6962d7db8a2e2808574e8c257c15aef55f403a1fb5a0faf35de70e6f3 SHA256 (slapd) = 944b82221355957485c9a4ccb34bc1e85631cc1bdd9ae480f70a3ab84780adc4 diff --git a/openldap/Pkgfile b/openldap/Pkgfile index 7feb0caff..d58b4b1fb 100644 --- a/openldap/Pkgfile +++ b/openldap/Pkgfile @@ -4,14 +4,13 @@ # Depends on: cyrus-sasl libtool perl util-linux name=openldap -version=2.4.59 +version=2.6.1 release=1 source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/$name-$... - $name-config.patch slapd) + slapd) build() { cd $name-$version - patch -p0 -i $SRC/$name-config.patch ./configure \ --prefix=/usr \ @@ -36,6 +35,7 @@ build() { --enable-dnssrv \ --enable-null \ --enable-perl \ + --enable-dynacl \ --enable-aci \ --enable-shared diff --git a/openldap/openldap-config.patch b/openldap/openldap-config.patch deleted file mode 100644 index ba18435f6..000000000 --- a/openldap/openldap-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: servers/slapd/slapd.conf ---- servers/slapd/slapd.conf.orig 2003-05-25 01:19:14.000000000 +0200 -+++ servers/slapd/slapd.conf 2003-12-05 10:43:58.000000000 +0100 -@@ -64,4 +64,21 @@ - # Mode 700 recommended. - directory %LOCALSTATEDIR%/openldap-data - # Indices to maintain -+ - index objectClass eq -+ -+####################################################################### -+# replication via slurpd(8) -+####################################################################### -+ -+# master server configuration -+#replogfile %LOCALSTATEDIR%/openldap-slurp -+#replica-pidfile %LOCALSTATEDIR%/slurpd.pid -+#replica host=slave.example.com:389 -+# binddn="cn=admin,dc=example,dc=org" -+# bindmethod=simple credentials=secret -+ -+# slave server(s) configuration -+#updatedn "cn=admin,dc=example,dc=org" -+#updateref ldap://master.example.org -+