From nobody Fri Feb 23 22:52:28 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ThQJD6Gz8z5BgqR; Fri, 23 Feb 2024 22:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThQJD5rR1z4GF1; Fri, 23 Feb 2024 22:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708728748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nidGEQsr3IWhgD6AHz2fAElx3pnfDDyc5s5WBcUhK3M=; b=Ax9EUFXl411+HS7QxmWoTfsTFyBYLZMvCxxyRIoTc0vajwmJlMPcRufUQJ6rOP3NkPTsOn rgqKMudgJIPuwGZoJl2kAgoNUHf26YYCcuQxCgkd0vcTvUk7NSKz4GrcGIvdy5UJJyY/3k oE1X6eBFVhPdUpNKuDPagTPMVx1xy3x8Mx2ZrftMROebGkhp03ODPMcfDJ0kTdpFzjbFdJ 3cvMt8EMkEsWULytfMoJLPBsBfN2NANCljnpajLDGVswpr10rZIkE2FWsMU/sNwnmuV5Kh Ko9/c8Isqmel/TJwR4iQqGtYczcNqoH/RB4YRFCHxLrUTDUiRzp8uqAZwLSPwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708728748; a=rsa-sha256; cv=none; b=PE5d/AABydNZ2XrBOHPA3T+oj7jdjqjb5v8jnjAq2jjstEL6sjv9raIYVBN3zO59oeh5fA KOBBBH4oZbTYeRjw7Cmyjm4nM2Hx1EIcTgxh1WQH4yDoz8CA3586lOnUylv5U2Ch26D6Wn PSaRB5vZ1gKxTpSgoSUcZYUP2y3p9L0GVtNH1MwUi7yPceqFqvvFGsWYMmtKsobQ19mNZP H+MWvW7tYoSymvFYBj9Pwcb3HIyQDhD80YMtIS50Oxr4JLVCnSCqUojGaFTMr3NVULzP3l hKVbEXKbmg/Ovf5jGea37BGaDGb1WbQQz7RD6sLNc5xmOZT6tSFQaWhR9vokug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708728748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nidGEQsr3IWhgD6AHz2fAElx3pnfDDyc5s5WBcUhK3M=; b=IESgB6vazAW8Irc/3PEWMDIxkdBHYun1nrjRV7HGhs4uxZ41i7OvOfSM4EMdYFr9XkUbNH NzAz6oUr/+CuErWCZfJnIRslZreC5gVs01LbBUQLwgUuSofCt+byvAkXNc7poVrVOipHsB Gy/nnydS94nRxS4I/xbBVWzgskQ+88SAnWuo46ZNKAZN1Cfg6R3odrORS41biZOuLT/39/ FutppAWeKkAsFPNbbZXnOwYDc4QWo1+xJ4mA7PFqJCrZX37J6h3/0FZ/6LPv7PKOGXBreZ /9hFpesiiWzP9BfdcLpctxflqTEkPTYz5LclR1SaM0chYkoDWNx1WXaiw9IGQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ThQJD4xl5zb93; Fri, 23 Feb 2024 22:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NMqSKq027088; Fri, 23 Feb 2024 22:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NMqSIB027085; Fri, 23 Feb 2024 22:52:28 GMT (envelope-from git) Date: Fri, 23 Feb 2024 22:52:28 GMT Message-Id: <202402232252.41NMqSIB027085@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: be7d044437f6 - main - devel/p5-Test-OpenLDAP: update to 0.72 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be7d044437f61c0740f3e3baf27f13397c29a53b Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=be7d044437f61c0740f3e3baf27f13397c29a53b commit be7d044437f61c0740f3e3baf27f13397c29a53b Author: Rodrigo Osorio AuthorDate: 2024-02-23 08:22:36 +0000 Commit: Rodrigo Osorio CommitDate: 2024-02-23 22:51:41 +0000 devel/p5-Test-OpenLDAP: update to 0.72 Changelog: https://metacpan.org/release/DDICK/Test-OpenLDAP-0.72/source/Changes --- devel/p5-Test-OpenLDAP/Makefile | 16 ++---- devel/p5-Test-OpenLDAP/distinfo | 5 +- devel/p5-Test-OpenLDAP/files/patch-OpenLDAP.pm | 65 ---------------------- .../files/patch-lib_Test_OpenLDAP.pm | 30 ++++++++++ 4 files changed, 37 insertions(+), 79 deletions(-) diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile index 9df623458b27..278d087c517d 100644 --- a/devel/p5-Test-OpenLDAP/Makefile +++ b/devel/p5-Test-OpenLDAP/Makefile @@ -1,6 +1,5 @@ PORTNAME= Test-OpenLDAP -PORTVERSION= 0.05 -PORTREVISION= 6 +PORTVERSION= 0.72 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,22 +11,15 @@ WWW= https://metacpan.org/release/Test-OpenLDAP LICENSE= ART10 GPLv1+ LICENSE_COMB= dual -RUN_DEPENDS= \ - p5-Data-UUID>0:devel/p5-Data-UUID \ - p5-perl-ldap>0:net/p5-perl-ldap BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-Data-UUID>0:devel/p5-Data-UUID \ + p5-perl-ldap>0:net/p5-perl-ldap -NO_ARCH= yes USES= ldap:server perl5 USE_PERL5= configure CONFIGURE_ENV= PATH=${PATH}:${PREFIX}/libexec -post-patch: - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - -e 's|/usr/lib/openldap|${LOCALBASE}/libexec|' \ - ${WRKSRC}/lib/Test/OpenLDAP.pm - ${RM} ${WRKSRC}/lib/Test/OpenLDAP.pm.bak \ - ${WRKSRC}/lib/Test/OpenLDAP.pm.orig +NO_ARCH= yes .include diff --git a/devel/p5-Test-OpenLDAP/distinfo b/devel/p5-Test-OpenLDAP/distinfo index e05b84d057a5..3966e8abce7b 100644 --- a/devel/p5-Test-OpenLDAP/distinfo +++ b/devel/p5-Test-OpenLDAP/distinfo @@ -1,2 +1,3 @@ -SHA256 (Test-OpenLDAP-0.05.tar.gz) = 9af0cfa9eb6d851422ceee6f6208d7ccfcf2680de49c5ed36320f5e721782761 -SIZE (Test-OpenLDAP-0.05.tar.gz) = 20747 +TIMESTAMP = 1708636855 +SHA256 (Test-OpenLDAP-0.72.tar.gz) = ee8ce6cf33c6bca17da71f72a3ec82af2af040a6dc195b4c5e12e5718d91f90e +SIZE (Test-OpenLDAP-0.72.tar.gz) = 22942 diff --git a/devel/p5-Test-OpenLDAP/files/patch-OpenLDAP.pm b/devel/p5-Test-OpenLDAP/files/patch-OpenLDAP.pm deleted file mode 100644 index 3a83f2fb73da..000000000000 --- a/devel/p5-Test-OpenLDAP/files/patch-OpenLDAP.pm +++ /dev/null @@ -1,65 +0,0 @@ ---- lib/Test/OpenLDAP.pm.orig 2013-03-13 10:05:02 UTC -+++ lib/Test/OpenLDAP.pm -@@ -95,6 +95,8 @@ sub new { - File::Spec->catdir( $self->{slapd_d_directory}, 'cn=config' ); - $self->{cn_schema_directory} = - File::Spec->catdir( $self->{cn_config_directory}, 'cn=schema' ); -+ $self->{cn_module_ldif_path} = -+ File::Spec->catfile( $self->{cn_config_directory}, 'cn=module{0}.ldif' ); - $self->{cn_schema_ldif_path} = - File::Spec->catfile( $self->{cn_config_directory}, 'cn=schema.ldif' ); - $self->{cn_schema_core_ldif_path} = -@@ -123,6 +125,7 @@ sub new { - mkdir $self->{db_directory}, oct USER_READ_WRITE_EXECUTE_PERMISSIONS() - or Carp::croak("Failed to mkdir $self->{db_directory}:$OS_ERROR"); - $self->_create_config_ldif(); -+ $self->_create_module_ldif(); - $self->_create_schema_ldif(); - $self->_create_schema_core_ldif(); - $self->{olc_database_for_config} = '{0}config'; -@@ -372,6 +375,34 @@ __CONFIG_LDIF__ - return; - } - -+sub _create_module_ldif { -+ my ($self) = @_; -+ my $write_flags = Fcntl::O_WRONLY() | Fcntl::O_CREAT() | Fcntl::O_EXCL(); -+ my $uuid = lc $self->_uuid(); -+ my $entry_csn = $self->_entry_csn(); -+ my $create_timestamp = POSIX::strftime( '%Y%m%d%H%M%SZ', gmtime time ); -+ my $handle = FileHandle->new( $self->{cn_module_ldif_path}, -+ $write_flags, oct USER_READ_WRITE_PERMISSIONS() ) -+ or Carp::croak( -+ "Failed to open '$self->{cn_module_ldif_path}' for writing:$OS_ERROR"); -+ $handle->print( -+ <<"__MODULE_LDIF__") or Carp::croak("Failed to write to '$self->{cn_module_ldif_path}':$OS_ERROR"); -+dn: cn=module{0} -+objectClass: olcModuleList -+cn: module{0} -+olcModulePath: %%LOCALBASE%%/libexec/openldap -+olcModuleLoad: {0}back_bdb -+olcModuleLoad: {1}back_hdb -+structuralObjectClass: olcModuleList -+entryUUID: $uuid -+creatorsName: cn=config -+createTimestamp: $create_timestamp -+entryCSN: $entry_csn -+modifiersName: cn=config -+modifyTimestamp: $create_timestamp -+__MODULE_LDIF__ -+} -+ - sub _create_schema_ldif { - my ($self) = @_; - my $write_flags = Fcntl::O_WRONLY() | Fcntl::O_CREAT() | Fcntl::O_EXCL(); -@@ -1697,6 +1728,10 @@ sub DESTROY { - or Carp::croak( - "Failed to unlink '$self->{olc_database_config_path}':$OS_ERROR"); - $self->_remove_cn_schema_directory(); -+ unlink $self->{cn_module_ldif_path} -+ or ( $OS_ERROR == POSIX::ENOENT() ) -+ or Carp::croak( -+ "Failed to unlink '$self->{cn_module_ldif_path}':$OS_ERROR"); - rmdir $self->{cn_config_directory} - or ( $OS_ERROR == POSIX::ENOENT() ) - or diff --git a/devel/p5-Test-OpenLDAP/files/patch-lib_Test_OpenLDAP.pm b/devel/p5-Test-OpenLDAP/files/patch-lib_Test_OpenLDAP.pm new file mode 100644 index 000000000000..0b40a9173a88 --- /dev/null +++ b/devel/p5-Test-OpenLDAP/files/patch-lib_Test_OpenLDAP.pm @@ -0,0 +1,30 @@ +--- lib/Test/OpenLDAP.pm.orig 2024-02-22 23:31:46 UTC ++++ lib/Test/OpenLDAP.pm +@@ -120,6 +120,7 @@ + sub _version { + my ($self) = @_; + my $key = '_slapd_version'; ++ local $ENV{PATH} = "$ENV{PATH}$Config{path_sep}/usr/local/libexec"; + if ( defined $self->{$key} ) { + } + else { +@@ -197,7 +198,7 @@ + { + my $path_sep = $Config{path_sep}; + my @slapd_directories = split /$path_sep/smx, +- "$ENV{PATH}$path_sep/usr/lib/openldap"; ++ "$ENV{PATH}$path_sep/usr/local/libexec"; + my $slapd_path; + foreach my $directory (@slapd_directories) { + my $possible = +@@ -250,8 +251,8 @@ + } + elsif ( defined $pid ) { + eval { +- local $ENV{PATH} = "$ENV{PATH}$Config{path_sep}/usr/lib/openldap" +- ; # adding /usr/lib/openldap for OpenSUSE deployments ++ local $ENV{PATH} = "$ENV{PATH}$Config{path_sep}/usr/local/libexec" ++ ; # adding /usr/local/libexec for OpenSUSE deployments + sysopen STDERR, $dev_null, Fcntl::O_WRONLY() + or + Carp::croak("Failed to redirect STDERR to $dev_null:$OS_ERROR");