ports/127809: [patch] security/cyrus-sasl2-authd: install man8/saslauthd.8 instead of cat8/saslauthd.8

Fri Oct 3 06:40:01 UTC 2008

>Number:         127809
>Category:       ports
>Synopsis:       [patch] security/cyrus-sasl2-authd: install man8/saslauthd.8 instead of cat8/saslauthd.8
>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:   Fri Oct 03 06:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Scot W. Hetzel
>Release:        8.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010 8.0-CURRENT FreeBSD 8.0-CURRENT #8: Mon Aug 11 17:10:07 CDT 2008     root at hp010:/usr/obj/usr/src/8x/sys/DV8135NR  amd64

>Description:
While making a backup package of cyrus-sasl2-saslauthd, pkg-create complained about a missing /usr/local/man/cat8/saslauthd.8.gz.

I found that /etc/periodic/weekly/330.catman (with weekly_catman_enable=YES0 will cause the PREFIX/man/cat8/saslauthd.8.gz file to be removed., when it fails to find a corresponding PREFIX/man/man8/saslauthd.8{,.gz} file.

I noticed that ports do-build target removes ${WRKSRC}/saslauthd/saslauthd.8, which causes the saslauthd.8 to be rebuilt using nroff -mdoc saslauthd.mdoc, when ${WRKSRC}/saslauthd/Makefile is used to install this files.

A much cleaner solution would be to install saslauthd.mdoc to PREFIX/man/man8/saslauthd.8, and use the MAN8 variable in the ports Makefile.

After I had modified the port to do this, I compared the man generated cat8/saslauthd.8 file to the nroff -mdoc generated saslauthd.8 file.  The only difference I found involved white space changes between these files.
>How-To-Repeat:
Install the port, set weekly_catman_enable=YES in /etc/periodic.conf, run /etc/periodic/weekly/330.catman, finally use 'pkg_create -b cyrus-sasl2-saslauthd-2.1.22' or uninstall the port.
>Fix:
Install saslauthd.mdoc in PREFIX/man/man8/saslauthd.8

The attached patch provides this change, as well as some minor fixes.

NOTE: The patch affects both the security/cyrus-sasl2 and security/cyrus-sasl2-saslauthd ports.

Patch attached with submission follows:

Index: cyrus-sasl2/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.135
diff -u -r1.135 Makefile

--- cyrus-sasl2/Makefile	21 May 2008 02:30:23 -0000	1.135
+++ cyrus-sasl2/Makefile	3 Oct 2008 04:10:15 -0000
@@ -73,7 +73,9 @@
 
 .if defined(WITH_BDB)
 USE_BDB=	yes
-CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
+INVALID_BDB_VER=2
+CONFIGURE_ARGS+=--with-dblib=berkeley \
+		--with-bdb-libdir=${BDB_LIB_DIR} \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 SASLDB_NAME=	sasldb2
Index: cyrus-sasl2/files/patch-saslauthd::Makefile.in
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 patch-saslauthd::Makefile.in
--- cyrus-sasl2/files/patch-saslauthd::Makefile.in	19 May 2006 20:45:36 -0000	1.3
+++ cyrus-sasl2/files/patch-saslauthd::Makefile.in	3 Oct 2008 01:38:15 -0000
@@ -7,7 +7,7 @@
  install-data-local: saslauthd.8
  	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
 -	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
++	$(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
Index: cyrus-sasl2-saslauthd/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2-saslauthd/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- cyrus-sasl2-saslauthd/Makefile	7 Aug 2007 16:46:22 -0000	1.51
+++ cyrus-sasl2-saslauthd/Makefile	3 Oct 2008 05:11:56 -0000
@@ -27,6 +27,8 @@
 INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/saslauthd
 DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
+MAN8=		saslauthd.8
+
 USE_RC_SUBR=	saslauthd.sh
 
 USE_OPENSSL=	yes
@@ -50,7 +52,9 @@
 
 .if defined(WITH_BDB)
 USE_BDB=	yes
-CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \
+INVALID_BDB_VER=2
+CONFIGURE_ARGS+=--with-dblib=berkeley \
+		--with-bdb-libdir=${BDB_LIB_DIR} \
 		--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
 .else
@@ -118,7 +122,6 @@
 SUB_LIST+=	SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH}
 
 do-build:
-	@${RM} -f ${WRKSRC}/saslauthd/saslauthd.8
 	cd ${WRKSRC}/include && ${MAKE}
 	cd ${WRKSRC}/sasldb && ${MAKE}
 	cd ${WRKSRC}/saslauthd && ${MAKE}
@@ -130,11 +133,10 @@
 		${PREFIX}/sbin/saslcache
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
 		${PREFIX}/sbin/testsaslauthd
-	${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "SASLAUTHD_RUNPATH was specified."
-	@${ECHO_MSG} "Make sure to have ${SASLAUTHD_RUNPATH} by yourself."
+	@${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}."
 	@${ECHO_MSG} ""
 .else
 	${MKDIR} -m 770 ${SASLAUTHD_RUNPATH}
Index: cyrus-sasl2-saslauthd/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2-saslauthd/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- cyrus-sasl2-saslauthd/pkg-plist	26 Dec 2005 14:52:22 -0000	1.6
+++ cyrus-sasl2-saslauthd/pkg-plist	3 Oct 2008 01:41:14 -0000
@@ -1,4 +1,3 @@
-man/cat8/saslauthd.8.gz
 sbin/saslauthd
 sbin/saslcache
 sbin/testsaslauthd


>Release-Note:
>Audit-Trail:
>Unformatted:

