Subject: pkg/22912: Fix security/pks' patch-aa
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <jonathan@perkin.org.uk>
List: netbsd-bugs
Date: 09/23/2003 12:40:35
>Number: 22912
>Category: pkg
>Synopsis: Fix security/pks' patch-aa
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Sep 23 12:41:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator: Jonathan Perkin
>Release: N/A
>Organization:
British Broadcasting Corporation
>Environment:
SunOS build1 5.9 Generic_112233-01 sun4u sparc SUNW,UltraSPARC-IIi-cEngine
>Description:
Not sure how this one ever worked before. security/pks/patches/patch-aa
removes a variable which is later used in `for i in variable; ...',
which obviously breaks the shell.
Removing the targets which use the variable fixes the build.
>How-To-Repeat:
===> Building for pks-0.9.4
for i in ; do (test -d $i && cd $i && bmake all) || exit 1; done
/bin/sh: syntax error at line 1: `;' unexpected
*** Error code 2
>Fix:
http://www.perkin.org.uk/projects/netbsd/pks.diff
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/pks/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 2001/04/19 15:40:37 1.2
+++ distinfo 2003/09/23 12:35:50
@@ -6,7 +6,7 @@
Size (pks094-patch2) = 52843 bytes
SHA1 (pks094-patch3) = 06849efc45f8c36708057a15c893c5694adc9278
Size (pks094-patch3) = 11120 bytes
-SHA1 (patch-aa) = e93eb32936f324f980e32d8bf7d38fbbd94447de
+SHA1 (patch-aa) = 9af8803154531b8444a87f3bc3156f663dd2186e
SHA1 (patch-ab) = 2a6918f4e0620090d733147bdd093b370065dce1
SHA1 (patch-ac) = 9d214cfb14ab7790b768ac4e7a184b3a4a09c6c0
SHA1 (patch-ad) = 7f82a8277d8c958ec2791e0ad1dcafa67971b4ff
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/pks/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa 2000/07/27 16:10:24 1.1.1.1
+++ patches/patch-aa 2003/09/23 12:35:50
@@ -1,20 +1,25 @@
$NetBSD: patch-aa,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $
---- Makefile.in.orig Thu Jul 27 11:11:28 2000
-+++ Makefile.in Thu Jul 27 11:24:02 2000
-@@ -9,9 +9,9 @@
+--- Makefile.in.orig Tue Sep 23 13:27:50 2003
++++ Makefile.in Tue Sep 23 13:29:24 2003
+@@ -9,12 +9,12 @@
SHELL = /bin/sh
## this does recursion for db2, if it's in the tree
--
--SUBDIRS = db2-sleepycat/dist
--
+#
+# We use the installed db2, so we don't need this line anymore
+#
- depend all install check clean distclean maintainer-clean::
- for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done
++#depend all install check clean distclean maintainer-clean::
++# for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done
+
+-SUBDIRS = db2-sleepycat/dist
+-
+-depend all install check clean distclean maintainer-clean::
+- for i in ${SUBDIRS}; do (test -d $$i && cd $$i && ${MAKE} $@) || exit 1; done
+-
+ ## this builds the keyserver
+ ALL = pksclient pksd pksdctl pgpsplit
@@ -32,12 +32,13 @@
all-pure:: $(ALL_PURE)
all-utils:: $(UTILS)
>Release-Note:
>Audit-Trail:
>Unformatted: