From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 31 22:30:11 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE3A21065673 for ; Tue, 31 Jul 2012 22:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 79A1A8FC14 for ; Tue, 31 Jul 2012 22:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6VMUBov093076 for ; Tue, 31 Jul 2012 22:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6VMUB6W093074; Tue, 31 Jul 2012 22:30:11 GMT (envelope-from gnats) Resent-Date: Tue, 31 Jul 2012 22:30:11 GMT Resent-Message-Id: <201207312230.q6VMUB6W093074@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2762106566C for ; Tue, 31 Jul 2012 22:25:24 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 948BE8FC16 for ; Tue, 31 Jul 2012 22:25:24 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6VMPOHa092970 for ; Tue, 31 Jul 2012 22:25:24 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6VMPOpk092969; Tue, 31 Jul 2012 22:25:24 GMT (envelope-from ohauer) Message-Id: <201207312225.q6VMPOpk092969@freefall.freebsd.org> Date: Tue, 31 Jul 2012 22:25:24 GMT From: Olli Hauer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/170300: [patch] net/openldap24-server preserve modified *.schema files X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Olli Hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2012 22:30:11 -0000 >Number: 170300 >Category: ports >Synopsis: [patch] net/openldap24-server preserve modified *.schema files >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 31 22:30:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: FreeBSD 8.3-RELEASE-p3 amd64 >Organization: >Environment: >Description: Code to install / compair / remove the *.schema files is generated in the Makefile and injected to $TMPPLIST. Modified *.schema files are not protected during update / deinstallation. I haven't found a quick fix for the libexec/openldap directory. It seems this change from version to version (was present in version 2.4.31 but not in 2.4.32). >How-To-Repeat: Build the port with the new pkg and take a look into the +MANIFEST file additional grep for 'pkg: lstst' in the build log. >Fix: --- openldap24-server.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 301815) +++ Makefile (working copy) @@ -7,6 +7,7 @@ PORTNAME= openldap DISTVERSION= 2.4.32 +PORTREVISION= 1 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ Index: pkg-plist =================================================================== --- pkg-plist (revision 301815) +++ pkg-plist (working copy) @@ -5,31 +5,18 @@ @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi etc/openldap/slapd.conf.default @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf -etc/openldap/schema/ppolicy.schema etc/openldap/schema/ppolicy.ldif -etc/openldap/schema/pmi.schema etc/openldap/schema/pmi.ldif -etc/openldap/schema/openldap.schema etc/openldap/schema/openldap.ldif -etc/openldap/schema/nis.schema etc/openldap/schema/nis.ldif -etc/openldap/schema/misc.schema etc/openldap/schema/misc.ldif -etc/openldap/schema/java.schema etc/openldap/schema/java.ldif -etc/openldap/schema/inetorgperson.schema etc/openldap/schema/inetorgperson.ldif -etc/openldap/schema/dyngroup.schema etc/openldap/schema/dyngroup.ldif -etc/openldap/schema/duaconf.schema etc/openldap/schema/duaconf.ldif -etc/openldap/schema/cosine.schema etc/openldap/schema/cosine.ldif -etc/openldap/schema/core.schema etc/openldap/schema/core.ldif -etc/openldap/schema/corba.schema etc/openldap/schema/corba.ldif -etc/openldap/schema/collective.schema etc/openldap/schema/collective.ldif etc/openldap/schema/README etc/openldap/DB_CONFIG.example --- openldap24-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: