diff options
| author | dholland <dholland@pkgsrc.org> | 2012-04-27 16:53:13 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-04-27 16:53:13 +0000 |
| commit | 2dda3c56db85552405e6efd06f9063f1f010bd21 (patch) | |
| tree | 79565c0bd76cea562e5fdbda7ceb8ba3a03f5514 | |
| parent | 5b1ddb791a5ebef0f07d98dfaf1d06b309e314c6 (diff) | |
| download | pkgsrc-2dda3c56db85552405e6efd06f9063f1f010bd21.tar.gz | |
Avoid infinite loop in configure script's options processing.
| -rw-r--r-- | chat/ircservices/distinfo | 4 | ||||
| -rw-r--r-- | chat/ircservices/patches/patch-aa | 31 |
2 files changed, 24 insertions, 11 deletions
diff --git a/chat/ircservices/distinfo b/chat/ircservices/distinfo index b4cb2eba972..d0c306a765b 100644 --- a/chat/ircservices/distinfo +++ b/chat/ircservices/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2010/07/15 11:48:21 obache Exp $ +$NetBSD: distinfo,v 1.15 2012/04/27 16:53:13 dholland Exp $ SHA1 (ircservices-5.0.64.tar.gz) = 6a12e05368da5dc251dd73b999856f2fc572a352 RMD160 (ircservices-5.0.64.tar.gz) = 4b6b0fc113a9ff0c9aa45d4462a48b3836d27d49 Size (ircservices-5.0.64.tar.gz) = 1163863 bytes -SHA1 (patch-aa) = cff60257c4f5ebdfd0af4984008d2677b293029b +SHA1 (patch-aa) = 1dfc77abd0358f52859f4615b47e4c5bcee268b1 SHA1 (patch-ab) = a15821c44bd9738080436a3626ec62d96c37db63 SHA1 (patch-ac) = d567871c9cbb05b329247155c55e26e265476b48 SHA1 (patch-ad) = b838e722e2c4019775b25cbc85ea2c5cf3510927 diff --git a/chat/ircservices/patches/patch-aa b/chat/ircservices/patches/patch-aa index 6d52b697782..a589d188a64 100644 --- a/chat/ircservices/patches/patch-aa +++ b/chat/ircservices/patches/patch-aa @@ -1,8 +1,21 @@ -$NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ +$NetBSD: patch-aa,v 1.3 2012/04/27 16:53:13 dholland Exp $ ---- configure.orig 2004-10-02 16:05:10.000000000 +0100 -+++ configure 2004-10-02 16:11:19.000000000 +0100 -@@ -1310,10 +1310,10 @@ +- avoid infinite loop in options processing +- ...? + +--- configure.orig 2009-07-31 14:46:19.000000000 +0000 ++++ configure +@@ -485,6 +485,9 @@ the corresponding command-line options ( + EOT + exit $exitval + fi ++ else ++ echo "$0: $1: Invalid argument/option" 1>&2 ++ exit 1 + fi + done + +@@ -1374,10 +1377,10 @@ EOT cat >$CONFTMP/test-lib.c <<EOT int foo() {no_such_symbol();} EOT @@ -15,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ then CC_DYN_LIBS=" -ldl" log "dlopen() found (libdl)" -@@ -1322,7 +1322,7 @@ +@@ -1386,7 +1389,7 @@ EOT OK= fi if [ "$OK" ] ; then @@ -24,7 +37,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ log "-rdynamic works" CC_DYN_LFLAGS=" -rdynamic" else -@@ -1336,7 +1336,7 @@ +@@ -1400,7 +1403,7 @@ EOT else CC_SHARED="$CC -shared" fi @@ -33,7 +46,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ log "-shared works" else log "no -shared, aborting dlfcn test" -@@ -1374,8 +1374,8 @@ +@@ -1438,8 +1441,8 @@ EOT return quux(bar)*2; } EOT @@ -44,7 +57,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ then a=`$CONFTMP/test 1` log "symbol resolution test: $CONFTMP/test 1 => $a" -@@ -1404,7 +1404,7 @@ +@@ -1468,7 +1471,7 @@ EOT } int quux(int x) {return x;} EOT @@ -53,7 +66,7 @@ $NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ then a=`$CONFTMP/test` log "underscore test: $CONFTMP/test => $a" -@@ -1428,6 +1428,7 @@ +@@ -1492,6 +1495,7 @@ EOT if [ "$OK" ] ; then echo "yes." STATIC_MODULES=0 |