diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/openldap/PKGBUILD | 16 | ||||
| -rw-r--r-- | core/openldap/openldap-nssov.patch | 30 | ||||
| -rw-r--r-- | core/openldap/slapd.tmpfiles | 2 |
3 files changed, 8 insertions, 40 deletions
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 838c91cbf..59ec01116 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 186436 2013-05-26 15:20:21Z eric $ +# $Id: PKGBUILD 193901 2013-09-04 19:28:51Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.35 -pkgrel=4 +pkgver=2.4.36 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) -sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' + slapd.service slapd.tmpfiles openldap-ntlm.patch) +sha1sums=('da0e18a28a5dade5c98d9a382fd8f0a676a12aca' '2441815efbfa01ad7a1d39068e5503b53d1d04b0' - 'f86a82e35ebe15026980467c9dee4007e686b795' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' - 'b2d11b4c522750ad9da3409333094fb599ac2c85') + '59241a813d7508294e4ef1cec3bfe1f5495e109d' + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/openldap-ntlm.patch - patch -p0 -i "${srcdir}"/openldap-nssov.patch sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} diff --git a/core/openldap/openldap-nssov.patch b/core/openldap/openldap-nssov.patch deleted file mode 100644 index 5ec2c36f3..000000000 --- a/core/openldap/openldap-nssov.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2013-03-28 11:41:51.000000000 -0400 -+++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2012-07-08 04:34:12.000000000 -0400 -@@ -71,6 +71,16 @@ - 1.0 release of nss-pam-ldapd is made. */ - #define NSLCD_VERSION 1 - -+/* Get a NSLCD configuration option. There is one request parameter: -+ INT32 NSLCD_CONFIG_* -+ the result value is: -+ STRING value, interpretation depending on request */ -+#define NSLCD_ACTION_CONFIG_GET 20006 -+ -+/* return the message, if any, that is presented to the user when password -+ modification through PAM is prohibited */ -+#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE 852 -+ - /* Email alias (/etc/aliases) NSS requests. The result values for a - single entry are: - STRING alias name -@@ -249,8 +262,10 @@ - #define NSLCD_PAM_NEW_AUTHTOK_REQD 12 /* Password expired */ - #define NSLCD_PAM_ACCT_EXPIRED 13 /* Account expired */ - #define NSLCD_PAM_SESSION_ERR 14 /* Cannot make/remove session record */ -+#define NSLCD_PAM_AUTHTOK_ERR 20 /* Authentication token manipulation error */ - #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */ - #define NSLCD_PAM_IGNORE 25 /* Ignore module */ - #define NSLCD_PAM_ABORT 26 /* Fatal error */ -+#define NSLCD_PAM_AUTHTOK_EXPIRED 27 /* authentication token has expired */ - - #endif /* not _NSLCD_H */ diff --git a/core/openldap/slapd.tmpfiles b/core/openldap/slapd.tmpfiles index 5f63bd636..b22c83135 100644 --- a/core/openldap/slapd.tmpfiles +++ b/core/openldap/slapd.tmpfiles @@ -1 +1 @@ -D /run/openldap 0750 ldap ldap - +D /run/openldap 0755 ldap ldap - |