From 1d45cc9072126f44b82c00232bfc64f64e29a6d3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 16 Apr 2019 16:26:19 +0200 Subject: [PATCH] 0.66 bump --- .gitignore | 1 + perl-LDAP.spec | 19 ++-- perl-ldap-0.65-Correct-misspellings.patch | 88 ------------------- ...NumberMatch-rule-from-2.5.4.23-OID-i.patch | 42 --------- sources | 2 +- 5 files changed, 10 insertions(+), 142 deletions(-) delete mode 100644 perl-ldap-0.65-Correct-misspellings.patch delete mode 100644 perl-ldap-0.65-Remove-facsimileNumberMatch-rule-from-2.5.4.23-OID-i.patch diff --git a/.gitignore b/.gitignore index 9677d47..445377e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ perl-ldap-0.40.tar.gz /perl-ldap-0.63.tar.gz /perl-ldap-0.64.tar.gz /perl-ldap-0.65.tar.gz +/perl-ldap-0.66.tar.gz diff --git a/perl-LDAP.spec b/perl-LDAP.spec index eb1bab7..2df9987 100644 --- a/perl-LDAP.spec +++ b/perl-LDAP.spec @@ -8,19 +8,15 @@ %endif Name: perl-LDAP -Version: 0.65 -Release: 13%{?dist} +Version: 0.66 +Release: 1%{?dist} Epoch: 1 Summary: LDAP Perl module License: GPL+ or Artistic URL: https://metacpan.org/release/perl-ldap Source0: https://cpan.metacpan.org/authors/id/M/MA/MARSCHAP/perl-ldap-%{version}.tar.gz -# Correct misspellings in Net::LDAP::FAQ, in upstream after 0.65 -Patch0: perl-ldap-0.65-Correct-misspellings.patch # Optional tests need to know a location of an LDAP server executable -Patch1: perl-ldap-0.65-Configure-usr-sbin-slapd-for-tests.patch -# Adapt tests to openldap-2.4.46, CPAN RT#129021 -Patch2: perl-ldap-0.65-Remove-facsimileNumberMatch-rule-from-2.5.4.23-OID-i.patch +Patch0: perl-ldap-0.65-Configure-usr-sbin-slapd-for-tests.patch BuildArch: noarch BuildRequires: perl-interpreter BuildRequires: perl-generators @@ -114,8 +110,6 @@ project. %prep %setup -q -n perl-ldap-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm perl -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/* # Remove bundled libraries @@ -129,8 +123,8 @@ make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -chmod -R u+w %{buildroot}/* +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} %{buildroot}/* %check make test @@ -152,6 +146,9 @@ make test %endif %changelog +* Tue Apr 16 2019 Jitka Plesnikova - 1:0.66-1 +- 0.66 bump + * Thu Apr 04 2019 Petr Pisar - 1:0.65-13 - Correct misspellings in Net::LDAP::FAQ - Perform tests against a server diff --git a/perl-ldap-0.65-Correct-misspellings.patch b/perl-ldap-0.65-Correct-misspellings.patch deleted file mode 100644 index 3c7a055..0000000 --- a/perl-ldap-0.65-Correct-misspellings.patch +++ /dev/null @@ -1,88 +0,0 @@ -From fba956c630d10b6ab1453f195d28dd1d3196bd04 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 4 Oct 2016 13:44:35 +0200 -Subject: [PATCH] Correct misspellings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - lib/Net/LDAP/FAQ.pod | 4 ++-- - lib/Net/LDAP/Schema.pod | 2 +- - lib/Net/LDAP/Security.pod | 8 ++++---- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/Net/LDAP/FAQ.pod b/lib/Net/LDAP/FAQ.pod -index fd34ccb..99d9036 100644 ---- a/lib/Net/LDAP/FAQ.pod -+++ b/lib/Net/LDAP/FAQ.pod -@@ -1195,7 +1195,7 @@ attribute name and no values. - In LDAPv3, this is defined to always work even if that attribute - doesn't exist in the entry. - --ie: -+I.e.: - - my $mesg = $ldap->modify( $entry, replace => { %qv_del_arry } ); - -@@ -1770,7 +1770,7 @@ eldapo - a directory manager's blog - http://eldapo.blogspot.de/ - - Eine deutsche LDAP Website --A german LDAP Website -+A German LDAP Website - http://verzeichnisdienst.de/ldap/Perl/index.html - - (non-exhaustive) list of LDAP software on Wikipedia -diff --git a/lib/Net/LDAP/Schema.pod b/lib/Net/LDAP/Schema.pod -index 92ab69c..e222b72 100644 ---- a/lib/Net/LDAP/Schema.pod -+++ b/lib/Net/LDAP/Schema.pod -@@ -32,7 +32,7 @@ may be an object class, attribute or syntax) then a case-insensitive name - or raw OID (object identifier, in dotted numeric string form, e.g. 2.5.4.0) - may be supplied. - --Each returned item of schema (eg an attribute definition) is returned -+Each returned item of schema (e.g. an attribute definition) is returned - in a HASH. The keys in the returned HASH are lowercase versions of - the keys read from the server. Here's a partial list (not all HASHes - define all keys) although note that RFC 4512 permits other keys as -diff --git a/lib/Net/LDAP/Security.pod b/lib/Net/LDAP/Security.pod -index a12a259..6ca48f1 100644 ---- a/lib/Net/LDAP/Security.pod -+++ b/lib/Net/LDAP/Security.pod -@@ -130,7 +130,7 @@ standardized version of SSL. - - You can only use TLS with an LDAPv3 server. That is because the - standard (RFC 4511) for LDAP and TLS requires that the I LDAP --connection (ie., on port 389) can be switched on demand from plain text -+connection (i.e., on port 389) can be switched on demand from plain text - into a TLS connection. The switching mechanism uses a special extended - LDAP operation, and since these are not legal in LDAPv2, you can only - switch to TLS on an LDAPv3 connection. -@@ -151,18 +151,18 @@ I. A number of mechanisms are defined, such as CRAM-MD5. - - The use of a mechanism like CRAM-MD5 provides a solution to the - password sniffing vulnerability, because these mechanisms typically do --not require the user to send across a secret (eg., a password) in the -+not require the user to send across a secret (e.g., a password) in the - clear across the network. Instead, authentication is carried out in a - clever way which avoids this, and so prevents passwords from being - sniffed. - - B supports SASL using the B class. Currently the --only B subclasses (ie., SASL mechanism) available are -+only B subclasses (i.e., SASL mechanism) available are - CRAM-MD5 and EXTERNAL. - - Some SASL mechanisms provide a general solution to the sniffing of all - data on the network vulnerability, as they can negotiate confidential --(ie., encrypted) network connections. Note that this is over and above -+(i.e., encrypted) network connections. Note that this is over and above - any SSL or TLS encryption! Unfortunately, perl's B code - cannot negotiate this. - --- -2.20.1 - diff --git a/perl-ldap-0.65-Remove-facsimileNumberMatch-rule-from-2.5.4.23-OID-i.patch b/perl-ldap-0.65-Remove-facsimileNumberMatch-rule-from-2.5.4.23-OID-i.patch deleted file mode 100644 index 6360d16..0000000 --- a/perl-ldap-0.65-Remove-facsimileNumberMatch-rule-from-2.5.4.23-OID-i.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3c8cc66320d9cb909cc8bea043280cace8bb5ff0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 4 Apr 2019 17:44:39 +0200 -Subject: [PATCH] Remove facsimileNumberMatch rule from 2.5.4.23 OID in core - schema -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When running tests that need an LDAP server, the tests fail because the server dies. -It's because my openldap-2.4.46 reports a syntax error in ./data/core.schema: - -$ /usr/sbin/slapd -f ./temp/slapd.conf -h ldap://localhost:9009/ -d 64 -[...] -5ca625e4 ./data/core.schema: line 192 (attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) DESC 'RFC2256: Facsimile (Fax) Telephone Number' EQUALITY facsimileNumberMatch SUBSTR facsimileNumberSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )) -5ca625e4 ./data/core.schema: line 192 attributetype: MatchingRule not found: "facsimileNumberMatch" - -This patch removes the offending matching rule because facsimileNumberMatch is -nowhere defined in the schema. (Maybe it was built into previous openldap -versions and removed later). - -Signed-off-by: Petr Písař ---- - data/core.schema | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/core.schema b/data/core.schema -index fd89c58..4e57898 100644 ---- a/data/core.schema -+++ b/data/core.schema -@@ -187,8 +187,6 @@ attributetype ( 2.5.4.22 NAME 'teletexTerminalIdentifier' - - attributetype ( 2.5.4.23 NAME ( 'facsimileTelephoneNumber' 'fax' ) - DESC 'RFC2256: Facsimile (Fax) Telephone Number' -- EQUALITY facsimileNumberMatch -- SUBSTR facsimileNumberSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 ) - - attributetype ( 2.5.4.24 NAME 'x121Address' --- -2.20.1 - diff --git a/sources b/sources index d0532fa..26f145c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d057c8db76913d95c0e460c7bdd98b27 perl-ldap-0.65.tar.gz +SHA512 (perl-ldap-0.66.tar.gz) = 58b066a73cbab6f9c709105a01d8bc04128dc52e3b10f6c99b4d4bb8fdb574a6471211a21416dbd06760b7c585e0a340920467b6805a3cc475f00ef27d084b2a