Date: Sun, 11 Sep 2005 20:47:44 GMT From: Graham Todd <gtodd@bellanet.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/85989: Update port: security/pks Message-ID: <200509112047.j8BKliG8094291@www.freebsd.org> Resent-Message-ID: <200509112050.j8BKoCYH016628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85989
>Category: ports
>Synopsis: Update port: security/pks
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 11 20:50:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Graham Todd
>Release: 5.4
>Organization:
Bellanet
>Environment:
localhost 5.4-RELEASE-p4 FreeBSD 5.4-RELEASE-p4 #2: Thu Jul 7 08:44:31 EDT 2005 root@localhost:/usr/obj/usr/src/sys/SMP i386
>Description:
pkg-plist corrections for build failure
ports-i386@pointyhat.freebsd.org reported: pks-0.9.6 failed on i386 7
This mtree error:
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
88103 16 -rw-r--r-- 1 root wheel 2059 Sep 10 17:26 usr/local/share/examples/pksd.conf
>How-To-Repeat:
Attempt make install package, pkg-add and pkg-delete of pks-0.9.6 as of Sept 10 2005.
>Fix:
Patch bellow should apply cleanly and correct the problem:
diff -urN pks.orig/Makefile pks/Makefile
--- pks.orig/Makefile Fri Sep 9 10:00:10 2005
+++ pks/Makefile Sun Sep 11 16:18:18 2005
@@ -18,24 +18,25 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
- --sysconfdir=${PREFIX}/share/examples \
+ --sysconfdir=${EXAMPLESDIR} \
--libdir=${LOCALBASE}/lib --with-libwrap
-CFLAGS+= -I/usr/local/include/db2
+CFLAGS+= -I${LOCALBASE}/include/db2
MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
USE_RC_SUBR= pksd.sh
MAN5= pksd.conf.5
MAN8= pks-intro.8 pksclient.8 pksd.8 pksdctl.8
USE_REINPLACE= yes
+SUB_FILES= pkg-message pkg-deinstall
# remove embedded sleepycat, remove associated build commands, make
# the build use the headers and libraries from the db2 port
post-patch:
${RM} -rf ${WRKSRC}/db2-sleepycat
${REINPLACE_CMD} 's|SUBDIRS =.*|SUBDIRS =|; \
- s|LIBDB =.*|LIBDB = -L/usr/local/lib -ldb2|; \
- s|DBDIR =.*|DBDIR = /usr/local/include/db2|' \
- ${WRKSRC}/Makefile.in
+ s|LIBDB =.*|LIBDB = -L${LOCALBASE}/lib -ldb2|; \
+ s|DBDIR =.*|DBDIR = ${LOCALBASE}/include/db2|' \
+ ${WRKSRC}/Makefile.in
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd.sh
diff -urN pks.orig/files/pkg-deinstall.in pks/files/pkg-deinstall.in
--- pks.orig/files/pkg-deinstall.in Wed Dec 31 19:00:00 1969
+++ pks/files/pkg-deinstall.in Sun Sep 11 15:44:34 2005
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/security/pks/pkg-deinstall,v 1.2 2005/09/09 14:00:10 lawrance Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+ ;;
+POST-DEINSTALL)
+ cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove the
+following directories and files:
+
+ %%PREFIX%%/etc/pksd.conf
+ /var/pks
+===========================================================================
+EOF
+ ;;
+*)
+ echo "Unexpected argument: ${STAGE}"
+ exit 1
+ ;;
+esac
+exit 0
diff -urN pks.orig/files/pkg-message.in pks/files/pkg-message.in
--- pks.orig/files/pkg-message.in Wed Dec 31 19:00:00 1969
+++ pks/files/pkg-message.in Sun Sep 11 15:37:34 2005
@@ -0,0 +1,11 @@
+
+
+ ##################################
+
+ To enable adding keys via the
+ web interface please edit the
+ configuration file at:
+
+ %%PREFIX%%/etc/pks/pksd.conf
+
+ ##################################
diff -urN pks.orig/pkg-deinstall pks/pkg-deinstall
--- pks.orig/pkg-deinstall Fri Sep 9 10:00:10 2005
+++ pks/pkg-deinstall Wed Dec 31 19:00:00 1969
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/pks/pkg-deinstall,v 1.2 2005/09/09 14:00:10 lawrance Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
- ;;
-POST-DEINSTALL)
- cat << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following directories and files:
-
- ${PREFIX}/etc/pksd.conf
- /var/pks
-===========================================================================
-EOF
- ;;
-*)
- echo "Unexpected argument: ${STAGE}"
- exit 1
- ;;
-esac
-exit 0
diff -urN pks.orig/pkg-message pks/pkg-message
--- pks.orig/pkg-message Fri Sep 9 10:00:10 2005
+++ pks/pkg-message Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
-
-
- ##################################
-
- To enable adding keys via the
- web interface please edit the
- configuration file at:
-
- /usr/local/etc/pks/pksd.conf
-
- ##################################
diff -urN pks.orig/pkg-plist pks/pkg-plist
--- pks.orig/pkg-plist Fri Sep 9 10:00:10 2005
+++ pks/pkg-plist Sun Sep 11 16:20:04 2005
@@ -5,7 +5,7 @@
sbin/pksd
bin/pksdctl
etc/pksd.conf.sample
-share/pks/mail_intro
+%%DATADIR%%/mail_intro
%%PORTDOCS%%%%DOCSDIR%%/mail_intro
%%PORTDOCS%%%%DOCSDIR%%/pks_help.en
%%PORTDOCS%%%%DOCSDIR%%/pks_help.es
@@ -14,4 +14,5 @@
%%PORTDOCS%%%%DOCSDIR%%/pks_help.cz
%%PORTDOCS%%%%DOCSDIR%%/pks_help.ja
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/pksd.conf
@dirrm share/pks
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509112047.j8BKliG8094291>