Attachment 143564 Details for Bug 190830 – nss-pam-ldapd-0.8.14.diff

[patch] nss-pam-ldapd-0.8.14.diff

nss-pam-ldapd-0.8.14.diff (text/plain), 3.07 KB, created by Olli Hauer on 2014-06-09 13:13:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2014-06-09 13:13:18 UTC

Size: 3.07 KB

patch

obsolete

>Index: nss-pam-ldapd/Makefile
>===================================================================
>--- nss-pam-ldapd/Makefile	(revision 357143)
>+++ nss-pam-ldapd/Makefile	(working copy)
>@@ -111,10 +111,7 @@
> show-pkgmessage::
> 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE} | ${FMT} 75 79; ${ECHO_CMD}
> 
>-# We take care of the sample file, upstream install target installs the actual
>-# file if it does not exist yet.
> post-install: show-pkgmessage
>-	@${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${STAGEDIR}${PREFIX}/etc/nslcd.conf.sample
> .if ${PORT_OPTIONS:MNSS}
> 	@${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/nss_ldap.so
> .endif
>Index: nss-pam-ldapd/files/patch-Makefile.in
>===================================================================
>--- nss-pam-ldapd/files/patch-Makefile.in	(revision 0)
>+++ nss-pam-ldapd/files/patch-Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- ./Makefile.in.orig	2014-06-09 14:12:14.000000000 +0200
>++++ ./Makefile.in	2014-06-09 14:12:30.000000000 +0200
>+@@ -849,7 +849,7 @@
>+ 	  echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \
>+ 	else \
>+ 	  $(mkinstalldirs) `dirname $(DESTDIR)$(NSLCD_CONF_PATH)`; \
>+-	  $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH); \
>++	  $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH).sample; \
>+ 	fi
>+ uninstall-nslcd_conf:
>+ 	-rm -f $(DESTDIR)$(NSLCD_CONF_PATH)
>
>Property changes on: nss-pam-ldapd/files/patch-Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: nss-pam-ldapd/files/pkg-message.in
>===================================================================
>--- nss-pam-ldapd/files/pkg-message.in	(revision 357143)
>+++ nss-pam-ldapd/files/pkg-message.in	(working copy)
>@@ -15,7 +15,7 @@
> If you also want to supervise the nslcd daemon
> add nslcd_supervisor="YES" to rc.conf as well.
> 
>-NOTE: supervision requires FreeBSD 9.1 or greater.
>+NOTE: supervision requires FreeBSD 8.4, 9.1 or greater.
> 
> See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables.
> =====================================================================
>Index: nss-pam-ldapd/pkg-plist
>===================================================================
>--- nss-pam-ldapd/pkg-plist	(revision 357143)
>+++ nss-pam-ldapd/pkg-plist	(working copy)
>@@ -1,11 +1,9 @@
>-@unexec if cmp -s %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; then rm -f %D/etc/%%CONFIG%%; fi
>-etc/%%CONFIG%%.sample
>+@sample etc/%%CONFIG%%.sample
> %%NSS%%lib/nss_ldap.so
> %%NSS%%lib/nss_ldap.so.%%NSS_LDAP_SHMAJOR%%
>-%%NSLCD%%sbin/nslcd
>-%%NSLCD%%man/man8/nslcd.8.gz
>-%%NSLCD%%man/man5/nslcd.conf.5.gz
> %%PAM%%lib/pam_ldap.so
> %%PAM%%lib/pam_ldap.so.%%PAM_LDAP_SHMAJOR%%
>+%%NSLCD%%man/man5/nslcd.conf.5.gz
>+%%NSLCD%%man/man8/nslcd.8.gz
> %%PAM%%man/man8/pam_ldap.8.gz
>-@exec if [ ! -f %D/etc/%%CONFIG%% ]; then cp -p %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; fi
>+%%NSLCD%%sbin/nslcd

Actions: View | Diff

Attachments on bug 190830: 143564