Date: Thu, 12 Oct 2006 07:05:59 +0800 (CST) From: Gea-Suan Lin <gslin@gslin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@gslin.org, kazakov@gmail.com Subject: ports/104310: [PATCH] net/nss_ldap: Fix some bugs Message-ID: <20061011230559.6C4B787@netnews.NCTU.edu.tw> Resent-Message-ID: <200610112310.k9BNAHYP016950@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104310
>Category: ports
>Synopsis: [PATCH] net/nss_ldap: Fix some bugs
>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: Wed Oct 11 23:10:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 6.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 6.1-RELEASE-p8 FreeBSD 6.1-RELEASE-p8 #0: Fri Sep 29 03:41:50 CST 2006
>Description:
- In some cases (like sudo), we should check euid not uid, thanks for
jnlin at csie.nctu.edu.tw
- Use MAN5PREFIX
- portlint warns:
1) IGNORE should be lowercase-lead
2) INSTALLS_SHLIB should be replaced by USE_LDCONFIG
3) PLIST_FILES should be used when only two files
- Bump PORTREVISION
Removed file(s):
- pkg-plist
Port maintainer (kazakov@gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- nss_ldap-1.251_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/nss_ldap/Makefile /home/staff/gslin/work/ports/nss_ldap/Makefile
--- /usr/ports/net/nss_ldap/Makefile Sun Jul 30 04:47:45 2006
+++ /home/staff/gslin/work/ports/nss_ldap/Makefile Thu Oct 12 06:58:06 2006
@@ -7,6 +7,7 @@
PORTNAME= nss_ldap
PORTVERSION= 1.${NSS_LDAP_VERSION}
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.padl.com/download/ \
${MASTER_SITE_LOCAL}
@@ -16,13 +17,14 @@
MAINTAINER= kazakov@gmail.com
COMMENT= RFC 2307 NSS module
-USE_OPENLDAP= yes
-
NSS_LDAP_VERSION=251
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+USE_OPENLDAP= yes
+
+PLIST_FILES= etc/nss_ldap.conf.sample lib/nss_ldap.so.1
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
@@ -44,13 +46,13 @@
${INSTALL_DATA} ${WRKSRC}/ldap.conf ${PREFIX}/etc/nss_ldap.conf.sample
@${REINPLACE_CMD} 's,/etc/ldap.,${PREFIX}/etc/nss_ldap.,g' \
${WRKSRC}/${MAN5}
- ${INSTALL_MAN} ${WRKSRC}/${MAN5} ${PREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5
${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500112
-IGNORE= NSS modules only supported on FreeBSD 5.1 or later
+IGNORE= this NSS modules only supported on FreeBSD 5.1 or later
.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/nss_ldap/files/patch-ldap-pwd.c /home/staff/gslin/work/ports/nss_ldap/files/patch-ldap-pwd.c
--- /usr/ports/net/nss_ldap/files/patch-ldap-pwd.c Wed May 24 18:48:59 2006
+++ /home/staff/gslin/work/ports/nss_ldap/files/patch-ldap-pwd.c Thu Oct 12 06:55:26 2006
@@ -21,7 +21,7 @@
+ * {
+ */
/* don't include password for shadowAccount */
-+ if (getuid() != 0)
++ if (geteuid() != 0)
+ {
+ /* don't include password for non-root users */
if (buflen < 3)
diff -ruN --exclude=CVS /usr/ports/net/nss_ldap/pkg-plist /home/staff/gslin/work/ports/nss_ldap/pkg-plist
--- /usr/ports/net/nss_ldap/pkg-plist Thu Jan 8 22:28:35 2004
+++ /home/staff/gslin/work/ports/nss_ldap/pkg-plist Thu Jan 1 08:00:00 1970
@@ -1,2 +0,0 @@
-etc/nss_ldap.conf.sample
-lib/nss_ldap.so.1
--- nss_ldap-1.251_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061011230559.6C4B787>