From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 7 14:00:39 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 944BF16A4E8 for ; Sun, 7 May 2006 14:00:39 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EAE043D53 for ; Sun, 7 May 2006 14:00:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k47E0UnY064255 for ; Sun, 7 May 2006 14:00:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k47E0Ub7064254; Sun, 7 May 2006 14:00:30 GMT (envelope-from gnats) Resent-Date: Sun, 7 May 2006 14:00:30 GMT Resent-Message-Id: <200605071400.k47E0Ub7064254@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, Dmitriy Kirhlarov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D098216A400 for ; Sun, 7 May 2006 14:00:03 +0000 (UTC) (envelope-from dkirhlarov@oilspace.com) Received: from office.oilspace.com (ns2.oilspace.com [194.129.65.230]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C94543D49 for ; Sun, 7 May 2006 14:00:02 +0000 (GMT) (envelope-from dkirhlarov@oilspace.com) Received: from dimma.mow.oilspace.com (hq.oilspace.com [81.222.156.185]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by office.oilspace.com (Postfix) with ESMTP id 6BAA5136CF5 for ; Sun, 7 May 2006 15:00:00 +0100 (BST) Received: from dimma.mow.oilspace.com (localhost [127.0.0.1]) by dimma.mow.oilspace.com (8.13.4/8.13.3) with ESMTP id k47Dxxaq012661 for ; Sun, 7 May 2006 17:59:59 +0400 (MSD) (envelope-from dkirhlarov@localhost.oilspace.com) Received: (from dkirhlarov@localhost) by dimma.mow.oilspace.com (8.13.4/8.13.3/Submit) id k47Dxx9l012660; Sun, 7 May 2006 17:59:59 +0400 (MSD) (envelope-from dkirhlarov) Message-Id: <200605071359.k47Dxx9l012660@dimma.mow.oilspace.com> Date: Sun, 7 May 2006 17:59:59 +0400 (MSD) From: Dmitriy Kirhlarov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96915: [PATCH] update LDAP-Account-Manager port to 1.0.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitriy Kirhlarov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 May 2006 14:00:39 -0000 >Number: 96915 >Category: ports >Synopsis: [PATCH] update LDAP-Account-Manager port to 1.0.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 07 14:00:29 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitriy Kirhlarov >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD dimma.mow.oilspace.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Sep 25 23:26:13 MSD 2005 root@dimma.mow.oilspace.com:/usr/obj/usr/src/sys/dimma i386 >Description: update for port sysutils/ldap-account-manager >How-To-Repeat: Look port version >Fix: diff -NruB ldap-account-manager.orig/Makefile ldap-account-manager/Makefile --- ldap-account-manager.orig/Makefile Fri May 5 12:49:35 2006 +++ ldap-account-manager/Makefile Sun May 7 10:53:10 2006 @@ -6,11 +6,11 @@ # PORTNAME= LDAP-Account-Manager -PORTVERSION= 0.5.1 +PORTVERSION= 1.0.1 CATEGORIES= sysutils www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lam -DISTNAME= ${PORTNAME:L}_${PORTVERSION} +DISTNAME= ${PORTNAME:L}-${PORTVERSION} MAINTAINER= clement@FreeBSD.org COMMENT= Webfrontend for managing accounts stored in an OpenLDAP server @@ -24,9 +24,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} WWW_ROOT?= www/lam +WWWOWN?= www +WWWGRP?= www +PKGINSTALL= ${WRKDIR}/pkg-install PLIST_SUB+= WWWROOT=${WWW_ROOT} WWW_DATA= index.html config graphics help lib locale sess style templates tmp -MYPORTDOCS= HISTORY README TODO COPYING copyright docs/* +MYPORTDOCS= HISTORY README TODO COPYING INSTALL VERSION copyright docs/* LAM_SCRIPTS= lib/lamdaemon.pl PORTDOCS= * @@ -45,15 +48,19 @@ ${INSTALL_DATA} ${WRKSRC}/config/config.cfg_sample ${PREFIX}/${WWW_ROOT}/config/config.cfg @[ -e ${PREFIX}/${WWW_ROOT}/config/lam.conf ] || \ ${INSTALL_DATA} ${WRKSRC}/config/lam.conf_sample ${PREFIX}/${WWW_ROOT}/config/lam.conf +post-patch: + @${SED} -e "s;%%WWWOWN%%;${WWWOWN};g" \ + -e "s;%%WWWGRP%%;${WWWGRP};g" \ + -e "s;%%WWW_ROOT%%;${WWW_ROOT};g" \ + ${.CURDIR}/pkg-install > ${PKGINSTALL} + +post-install: @${ECHO_MSG} "===> Setting correct permissions" @${FIND} ${PREFIX}/${WWW_ROOT} -type f -exec ${CHMOD} 644 {} \; @${FIND} ${PREFIX}/${WWW_ROOT} -type d -exec ${CHMOD} 755 {} \; - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${WWW_ROOT}/sess \ - ${PREFIX}/${WWW_ROOT}/tmp ${PREFIX}/${WWW_ROOT}/config @cd ${PREFIX}/${WWW_ROOT} ; ${CHMOD} 755 ${LAM_SCRIPTS} @${LN} -sf /etc/shells ${PREFIX}/${WWW_ROOT}/config/shells - -post-install: + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include diff -NruB ldap-account-manager.orig/distinfo ldap-account-manager/distinfo --- ldap-account-manager.orig/distinfo Fri May 5 12:49:35 2006 +++ ldap-account-manager/distinfo Sat May 6 16:29:31 2006 @@ -1,3 +1,3 @@ -MD5 (ldap-account-manager_0.5.1.tar.gz) = c29b114cff9b401690775c75f44dcaa4 -SHA256 (ldap-account-manager_0.5.1.tar.gz) = 083541218edf797812a1a3a6df69be8b5deb1419c4db0a5f429d8479f65516b3 -SIZE (ldap-account-manager_0.5.1.tar.gz) = 1282698 +MD5 (ldap-account-manager-1.0.1.tar.gz) = cba5ad2a36d6ed8f8e82269c81bdf375 +SHA256 (ldap-account-manager-1.0.1.tar.gz) = 87be4dfcc70afc2489c1235ba1f89de4e1c6e5987ff313685e1248827e05d08b +SIZE (ldap-account-manager-1.0.1.tar.gz) = 1532149 diff -NruB ldap-account-manager.orig/pkg-install ldap-account-manager/pkg-install --- ldap-account-manager.orig/pkg-install Thu Jan 1 00:00:00 1970 +++ ldap-account-manager/pkg-install Sat May 6 20:41:56 2006 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/local} +WWWOWN=${WWWOWN:=%%WWWOWN%%} +WWWGRP=${WWWGRP:=%%WWWGRP%%} +WWW_ROOT=${PKG_PREFIX}/%%WWW_ROOT%% + +chown -R ${WWWOWN}:${WWWGRP} ${WWW_ROOT}/sess ${WWW_ROOT}/tmp ${WWW_ROOT}/config diff -NruB ldap-account-manager.orig/pkg-plist ldap-account-manager/pkg-plist --- ldap-account-manager.orig/pkg-plist Fri May 5 12:49:35 2006 +++ ldap-account-manager/pkg-plist Sun May 7 10:27:20 2006 @@ -9,10 +9,14 @@ %%WWWROOT%%/config/language %%WWWROOT%%/config/pdf/default.group.xml %%WWWROOT%%/config/pdf/default.host.xml +%%WWWROOT%%/config/pdf/default.mailAlias.xml +%%WWWROOT%%/config/pdf/default.smbDomain.xml %%WWWROOT%%/config/pdf/default.user.xml %%WWWROOT%%/config/pdf/logos/printLogo.jpg %%WWWROOT%%/config/profiles/default.group %%WWWROOT%%/config/profiles/default.host +%%WWWROOT%%/config/profiles/default.mailAlias +%%WWWROOT%%/config/profiles/default.smbDomain %%WWWROOT%%/config/profiles/default.user %%WWWROOT%%/config/shells %%WWWROOT%%/graphics/add.png @@ -29,6 +33,7 @@ %%WWWROOT%%/graphics/find.png %%WWWROOT%%/graphics/folder.png %%WWWROOT%%/graphics/go.png +%%WWWROOT%%/graphics/group.png %%WWWROOT%%/graphics/hard-drive.png %%WWWROOT%%/graphics/help.png %%WWWROOT%%/graphics/host.png @@ -39,6 +44,7 @@ %%WWWROOT%%/graphics/locality.png %%WWWROOT%%/graphics/lock.png %%WWWROOT%%/graphics/mail.png +%%WWWROOT%%/graphics/mailAlias.png %%WWWROOT%%/graphics/minus.png %%WWWROOT%%/graphics/n.png %%WWWROOT%%/graphics/network.png @@ -55,6 +61,8 @@ %%WWWROOT%%/graphics/select.png %%WWWROOT%%/graphics/server-settings.png %%WWWROOT%%/graphics/server-small.png +%%WWWROOT%%/graphics/smbDomain.png +%%WWWROOT%%/graphics/smile.png %%WWWROOT%%/graphics/star.png %%WWWROOT%%/graphics/tools-no.png %%WWWROOT%%/graphics/tools.png @@ -63,12 +71,14 @@ %%WWWROOT%%/graphics/uniquegroup.png %%WWWROOT%%/graphics/up.gif %%WWWROOT%%/graphics/user.png +%%WWWROOT%%/graphics/userDefault.png %%WWWROOT%%/graphics/warn.png %%WWWROOT%%/help/help.inc %%WWWROOT%%/index.html %%WWWROOT%%/lib/.htaccess %%WWWROOT%%/lib/account.inc %%WWWROOT%%/lib/baseModule.inc +%%WWWROOT%%/lib/baseType.inc %%WWWROOT%%/lib/cache.inc %%WWWROOT%%/lib/config.inc %%WWWROOT%%/lib/createntlm.inc @@ -100,11 +110,13 @@ %%WWWROOT%%/lib/modules/inetLocalMailRecipient.inc %%WWWROOT%%/lib/modules/inetOrgPerson.inc %%WWWROOT%%/lib/modules/kolabUser.inc +%%WWWROOT%%/lib/modules/ldapPublicKey.inc %%WWWROOT%%/lib/modules/nisMailAlias.inc %%WWWROOT%%/lib/modules/posixAccount.inc %%WWWROOT%%/lib/modules/posixGroup.inc %%WWWROOT%%/lib/modules/quota.inc %%WWWROOT%%/lib/modules/sambaAccount.inc +%%WWWROOT%%/lib/modules/sambaDomain.inc %%WWWROOT%%/lib/modules/sambaGroupMapping.inc %%WWWROOT%%/lib/modules/sambaSamAccount.inc %%WWWROOT%%/lib/modules/shadowAccount.inc @@ -112,8 +124,15 @@ %%WWWROOT%%/lib/pdfstruct.inc %%WWWROOT%%/lib/profiles.inc %%WWWROOT%%/lib/schema.inc +%%WWWROOT%%/lib/security.inc %%WWWROOT%%/lib/status.inc %%WWWROOT%%/lib/tree.inc +%%WWWROOT%%/lib/types.inc +%%WWWROOT%%/lib/types/group.inc +%%WWWROOT%%/lib/types/host.inc +%%WWWROOT%%/lib/types/mailAlias.inc +%%WWWROOT%%/lib/types/smbDomain.inc +%%WWWROOT%%/lib/types/user.inc %%WWWROOT%%/lib/ufpdf.php %%WWWROOT%%/lib/xml_parser.inc %%WWWROOT%%/locale/ca_ES/LC_MESSAGES/messages.mo @@ -130,22 +149,28 @@ %%WWWROOT%%/locale/it_IT/LC_MESSAGES/messages.po %%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.mo %%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.po +%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.mo +%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.po +%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.mo +%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.po +%%WWWROOT%%/sess/.cvsignore %%WWWROOT%%/sess/.htaccess %%WWWROOT%%/style/layout.css +%%WWWROOT%%/style/type_group.css +%%WWWROOT%%/style/type_host.css +%%WWWROOT%%/style/type_mailAlias.css +%%WWWROOT%%/style/type_smbDomain.css +%%WWWROOT%%/style/type_user.css %%WWWROOT%%/templates/account/edit.php %%WWWROOT%%/templates/config/conflogin.php %%WWWROOT%%/templates/config/confmain.php %%WWWROOT%%/templates/config/confmodules.php -%%WWWROOT%%/templates/config/confsave.php +%%WWWROOT%%/templates/config/conftypes.php %%WWWROOT%%/templates/config/profmanage.php %%WWWROOT%%/templates/delete.php -%%WWWROOT%%/templates/domain.php %%WWWROOT%%/templates/help.php %%WWWROOT%%/templates/initsuff.php -%%WWWROOT%%/templates/lists/listdomains.php -%%WWWROOT%%/templates/lists/listgroups.php -%%WWWROOT%%/templates/lists/listhosts.php -%%WWWROOT%%/templates/lists/listusers.php +%%WWWROOT%%/templates/lists/list.php %%WWWROOT%%/templates/lists/userlink.php %%WWWROOT%%/templates/login.php %%WWWROOT%%/templates/logout.php @@ -190,6 +215,7 @@ %%WWWROOT%%/templates/tree/tree_view.php %%WWWROOT%%/templates/tree/update.php %%WWWROOT%%/templates/tree/update_confirm.php +%%WWWROOT%%/tmp/.cvsignore %%WWWROOT%%/tmp/.htaccess @dirrm %%WWWROOT%%/tmp @dirrm %%WWWROOT%%/templates/tree/templates/creation @@ -204,6 +230,10 @@ @dirrm %%WWWROOT%%/templates @dirrm %%WWWROOT%%/style @dirrm %%WWWROOT%%/sess +@dirrm %%WWWROOT%%/locale/zh_TW/LC_MESSAGES +@dirrm %%WWWROOT%%/locale/zh_TW +@dirrm %%WWWROOT%%/locale/nl_NL/LC_MESSAGES +@dirrm %%WWWROOT%%/locale/nl_NL @dirrm %%WWWROOT%%/locale/ja_JP/LC_MESSAGES @dirrm %%WWWROOT%%/locale/ja_JP @dirrm %%WWWROOT%%/locale/it_IT/LC_MESSAGES @@ -219,6 +249,7 @@ @dirrm %%WWWROOT%%/locale/ca_ES/LC_MESSAGES @dirrm %%WWWROOT%%/locale/ca_ES @dirrm %%WWWROOT%%/locale +@dirrm %%WWWROOT%%/lib/types @dirrm %%WWWROOT%%/lib/modules @dirrm %%WWWROOT%%/lib/font @dirrm %%WWWROOT%%/lib >Release-Note: >Audit-Trail: >Unformatted: