diff options
author | adrianp <adrianp@pkgsrc.org> | 2004-10-02 22:09:46 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2004-10-02 22:09:46 +0000 |
commit | f89da151de281b41142d314f3fe254aab74f7bab (patch) | |
tree | 6823624fa0652620049eaf72352b96fb46517c8a /chat/ircservices/patches | |
parent | 7747b9437cd4a726bf1d395290fc2471b4406179 (diff) | |
download | pkgsrc-f89da151de281b41142d314f3fe254aab74f7bab.tar.gz |
- Update irc-services from 5.0.16 to 5.0.40
Pkgsrc changes:
- Add a startup script
- Use SUBST_* framework (a lot)
- Install documentation and man pages
- Use CONF_FILES_* for installing config files
App changes:
- bugfixes
- documentation updates
- feature improvements
- See the Changes file for full details
Diffstat (limited to 'chat/ircservices/patches')
-rw-r--r-- | chat/ircservices/patches/patch-aa | 58 | ||||
-rw-r--r-- | chat/ircservices/patches/patch-ab | 13 | ||||
-rw-r--r-- | chat/ircservices/patches/patch-ac | 22 |
3 files changed, 64 insertions, 29 deletions
diff --git a/chat/ircservices/patches/patch-aa b/chat/ircservices/patches/patch-aa index 11d32eb69ed..6d52b697782 100644 --- a/chat/ircservices/patches/patch-aa +++ b/chat/ircservices/patches/patch-aa @@ -1,63 +1,63 @@ -$NetBSD: patch-aa,v 1.1 2003/05/25 21:03:26 jmc Exp $ +$NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $ ---- configure.orig Thu Apr 10 01:35:14 2003 -+++ configure Sun May 25 20:58:51 2003 -@@ -1012,10 +1012,10 @@ - cat >tmp/test-lib.c <<EOT +--- configure.orig 2004-10-02 16:05:10.000000000 +0100 ++++ configure 2004-10-02 16:11:19.000000000 +0100 +@@ -1310,10 +1310,10 @@ + cat >$CONFTMP/test-lib.c <<EOT int foo() {no_such_symbol();} EOT -- if run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -o tmp/test ; then -+ if run $CC -fPIC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -o tmp/test ; then +- if run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then ++ if run $CC -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then CC_DYN_LIBS="" log "dlopen() found (no libs)" -- elif run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -ldl -o tmp/test -+ elif run $CC -fPIC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -ldl -o tmp/test +- elif run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -ldl -o $CONFTMP/test ++ elif run $CC -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -ldl -o $CONFTMP/test then CC_DYN_LIBS=" -ldl" log "dlopen() found (libdl)" -@@ -1024,7 +1024,7 @@ +@@ -1322,7 +1322,7 @@ OK= fi if [ "$OK" ] ; then -- if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dlopen.c -o tmp/test ; then -+ if run $CC -rdynamic -fPIC $CC_FLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dlopen.c -o tmp/test ; then +- if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then ++ if run $CC -rdynamic -fPIC $CC_FLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then log "-rdynamic works" CC_DYN_LFLAGS=" -rdynamic" else -@@ -1038,7 +1038,7 @@ +@@ -1336,7 +1336,7 @@ else CC_SHARED="$CC -shared" fi -- if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-lib.c -o tmp/test-lib.so ; then -+ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS tmp/test-lib.c -o tmp/test-lib.so ; then +- if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so ; then ++ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so ; then log "-shared works" else log "no -shared, aborting dlfcn test" -@@ -1076,8 +1076,8 @@ +@@ -1374,8 +1374,8 @@ return quux(bar)*2; } EOT -- if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-dynamic.c -o tmp/test.so \ -- && run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test -+ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS tmp/test-dynamic.c -o tmp/test.so \ -+ && run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test +- if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-dynamic.c -o $CONFTMP/test.so \ +- && run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test ++ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dynamic.c -o $CONFTMP/test.so \ ++ && run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test then - a=`tmp/test 1` - log "symbol resolution test: tmp/test 1 => $a" -@@ -1106,7 +1106,7 @@ + a=`$CONFTMP/test 1` + log "symbol resolution test: $CONFTMP/test 1 => $a" +@@ -1404,7 +1404,7 @@ } int quux(int x) {return x;} EOT -- if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test -+ if run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test +- if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test ++ if run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test then - a=`tmp/test` - log "underscore test: tmp/test => $a" -@@ -1130,6 +1130,7 @@ + a=`$CONFTMP/test` + log "underscore test: $CONFTMP/test => $a" +@@ -1428,6 +1428,7 @@ if [ "$OK" ] ; then echo "yes." STATIC_MODULES=0 -+ CC_FLAGS="-fPIC $CC_FLAGS" ++ CC_FLAGS="-fPIC $CC_FLAGS" else log "static modules selected" echo "no." diff --git a/chat/ircservices/patches/patch-ab b/chat/ircservices/patches/patch-ab new file mode 100644 index 00000000000..1e99db886f2 --- /dev/null +++ b/chat/ircservices/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2004/10/02 22:09:46 adrianp Exp $ + +--- data/Makefile.orig 2004-10-02 20:44:29.000000000 +0100 ++++ data/Makefile 2004-10-02 20:44:38.000000000 +0100 +@@ -12,8 +12,6 @@ + all: # Nothing to do + + install: all $(DATDEST)/helpfiles +- $(INSTALL_DAT) example-ircservices.conf "$(DATDEST)/example-ircservices.conf" +- $(INSTALL_DAT) example-modules.conf "$(DATDEST)/example-modules.conf" + + $(DATDEST)/helpfiles: + $(CP_ALL) helpfiles "$(DATDEST)" diff --git a/chat/ircservices/patches/patch-ac b/chat/ircservices/patches/patch-ac new file mode 100644 index 00000000000..2c34eb94efa --- /dev/null +++ b/chat/ircservices/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2004/10/02 22:09:46 adrianp Exp $ + +--- data/example-modules.conf.orig 2004-10-02 20:01:04.000000000 +0100 ++++ data/example-modules.conf 2004-10-02 19:59:27.000000000 +0100 +@@ -366,7 +366,7 @@ + # "Session limit exceeded". If this is commented out, nothing will + # be sent. + +- SessionLimitExceeded "The session limit for your host %s has been exceeded." ++ SessionLimitExceeded "The session limit for your host %s has been exceeded." + + # SessionLimitDetailsLoc <message> [OPTIONAL] + # Same as above, but should be used to provide a website address +@@ -379,7 +379,7 @@ + # you supply an address/URL where people can get help regarding + # session limits. + +- #SessionLimitDetailsLoc "Please visit http://your.website.url/ for more information about session limits." ++ #SessionLimitDetailsLoc "Please visit http://your.website.url/ for more information about session limits." + + # SessionLimitAutokill <max-kill-interval> <num-kills> <expiry> <reason> [OPTIONAL] + # With this option, Services will add an automatic autokill when |