Mon Jan 12 06:46:43 2009 UTC ()
Upgrade silc-client to version 1.1.7, fixing various crash and Perl problems.
ChangeLog for 1.1.5 somehow got lost, but here are the bits from 1.1.6 and
1.1.7:
 - Fixed channel MAC key setting in JOIN notify and command reply.
 - Fix reference count bug leading to memory corruption on duplicate deletions.
 - Avoid NULL dereference when leaving a channel with a private key.
 - Fix crash on expired keyboard prompts.
 - Add support for autosendcmd on channel entries.


(tonnerre)
diff -r1.50 -r1.51 pkgsrc/chat/silc-client/Makefile
diff -r1.11 -r1.12 pkgsrc/chat/silc-client/Makefile.common
diff -r1.23 -r1.24 pkgsrc/chat/silc-client/PLIST
diff -r1.32 -r1.33 pkgsrc/chat/silc-client/distinfo
cvs diff -r1.50 -r1.51 pkgsrc/chat/silc-client/Makefile (switch to unified diff)

--- pkgsrc/chat/silc-client/Makefile 2008/10/19 19:17:41 1.50
+++ pkgsrc/chat/silc-client/Makefile 2009/01/12 06:46:43 1.51
@@ -1,84 +1,83 @@ @@ -1,84 +1,83 @@
1# $NetBSD: Makefile,v 1.50 2008/10/19 19:17:41 he Exp $ 1# $NetBSD: Makefile,v 1.51 2009/01/12 06:46:43 tonnerre Exp $
2# 2#
3 3
4DISTNAME= ${SILC_CLIENT_DISTNAME} 4DISTNAME= ${SILC_CLIENT_DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= chat security 5CATEGORIES= chat security
7MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ 6MASTER_SITES= http://www.silcnet.org/download/client/sources/ \
8 ftp://ftp.silcnet.org/silc/client/sources/ \ 7 ftp://ftp.silcnet.org/silc/client/sources/ \
9 http://www.fi.silcnet.org/download/client/sources/ \ 8 http://www.fi.silcnet.org/download/client/sources/ \
10 ftp://ftp.au.silcnet.org/pub/silcnet/client/sources/ 9 ftp://ftp.au.silcnet.org/pub/silcnet/client/sources/
11EXTRACT_SUFX= ${SILC_CLIENT_EXTRACT_SUFX} 10EXTRACT_SUFX= ${SILC_CLIENT_EXTRACT_SUFX}
12 11
13MAINTAINER= salo@NetBSD.org 12MAINTAINER= salo@NetBSD.org
14HOMEPAGE= http://www.silcnet.org/ 13HOMEPAGE= http://www.silcnet.org/
15COMMENT= Client for the Secure Internet Live Conferencing (SILC) protocol 14COMMENT= Client for the Secure Internet Live Conferencing (SILC) protocol
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18.include "../../chat/silc-client/Makefile.common" 17.include "../../chat/silc-client/Makefile.common"
19 18
20GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
21USE_TOOLS+= gmake 20USE_TOOLS+= gmake
22USE_LIBTOOL= YES 21USE_LIBTOOL= YES
23OVERRIDE_DIRDEPTH= 3 22OVERRIDE_DIRDEPTH= 3
24SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
25 24
26PKG_SYSCONFSUBDIR?= ${PKGBASE} 25PKG_SYSCONFSUBDIR?= ${PKGBASE}
27 26
28EGDIR= ${PREFIX}/share/examples/${PKGBASE} 27EGDIR= ${PREFIX}/share/examples/${PKGBASE}
29MAKE_ENV+= examplesdir=${EGDIR} 28MAKE_ENV+= examplesdir=${EGDIR}
30 29
31CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf 30CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
32 31
33CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} 32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
34CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/${PKGBASE}/help 33CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/${PKGBASE}/help
35CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} 34CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE}
36CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
37CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules 36CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules
38CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR} 37CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR}
39CONFIGURE_ARGS+= --with-terminfo 38CONFIGURE_ARGS+= --with-terminfo
40CONFIGURE_ARGS+= --enable-shared 39CONFIGURE_ARGS+= --enable-shared
41CONFIGURE_ARGS+= --without-libtoolfix 40CONFIGURE_ARGS+= --without-libtoolfix
42 41
43# Use native curses library. 42# Use native curses library.
44.if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS") 43.if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS")
45CONFIGURE_ARGS+= --with-vcurses 44CONFIGURE_ARGS+= --with-vcurses
46.elif (${OPSYS} == "Linux") || (${OPSYS} == "Darwin") 45.elif (${OPSYS} == "Linux") || (${OPSYS} == "Darwin")
47CONFIGURE_ARGS+= --with-ncurses 46CONFIGURE_ARGS+= --with-ncurses
48.else 47.else
49# XXX: Need testing on other operating systems, use safe defaults for now. 48# XXX: Need testing on other operating systems, use safe defaults for now.
50CONFIGURE_ARGS+= --with-ncurses 49CONFIGURE_ARGS+= --with-ncurses
51.endif 50.endif
52 51
53# Assembler optimizations. 52# Assembler optimizations.
54# 53#
55.if (${MACHINE_ARCH} != "i386") 54.if (${MACHINE_ARCH} != "i386")
56CONFIGURE_ARGS+= --disable-asm 55CONFIGURE_ARGS+= --disable-asm
57.endif 56.endif
58 57
59.include "options.mk" 58.include "options.mk"
60 59
61PLIST_SRC+= ${PKGDIR}/PLIST 60PLIST_SRC+= ${PKGDIR}/PLIST
62INSTALLATION_DIRS+= ${PREFIX}/libexec/${PKGBASE}/scripts 61INSTALLATION_DIRS+= ${PREFIX}/libexec/${PKGBASE}/scripts
63 62
64post-install: 63post-install:
65 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/config.h ${SILC_CLIENT_CONFIG_H} 64 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/config.h ${SILC_CLIENT_CONFIG_H}
66 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/irssi-config ${SILC_CLIENT_CONFIG} 65 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/irssi-config ${SILC_CLIENT_CONFIG}
67.if !empty(PKG_OPTIONS:Mperl) 66.if !empty(PKG_OPTIONS:Mperl)
68 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/scripts/*.pl \ 67 ${INSTALL_DATA} ${WRKSRC}/apps/irssi/scripts/*.pl \
69 ${PREFIX}/libexec/${PKGBASE}/scripts 68 ${PREFIX}/libexec/${PKGBASE}/scripts
70# Create PLIST fragment for Perl modules. 69# Create PLIST fragment for Perl modules.
71# 70#
72 @cd ${PREFIX} && \ 71 @cd ${PREFIX} && \
73 ( \ 72 ( \
74 ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl; \ 73 ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl; \
75 ${FIND} lib/${PKGBASE}/perl5 -type d | ${SORT} -r | \ 74 ${FIND} lib/${PKGBASE}/perl5 -type d | ${SORT} -r | \
76 ${SED} 's,^,@dirrm ,g' >> ${WRKDIR}/PLIST.perl \ 75 ${SED} 's,^,@dirrm ,g' >> ${WRKDIR}/PLIST.perl \
77 ) 76 )
78.endif 77.endif
79 78
80.include "../../converters/libiconv/buildlink3.mk" 79.include "../../converters/libiconv/buildlink3.mk"
81.include "../../devel/glib/buildlink3.mk" 80.include "../../devel/glib/buildlink3.mk"
82.include "../../devel/ncurses/buildlink3.mk" 81.include "../../devel/ncurses/buildlink3.mk"
83 82
84.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/chat/silc-client/Makefile.common (switch to unified diff)

--- pkgsrc/chat/silc-client/Makefile.common 2008/07/13 12:04:11 1.11
+++ pkgsrc/chat/silc-client/Makefile.common 2009/01/12 06:46:43 1.12
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.11 2008/07/13 12:04:11 tonnerre Exp $ 1# $NetBSD: Makefile.common,v 1.12 2009/01/12 06:46:43 tonnerre Exp $
2# 2#
3 3
4# Distribution specific information. 4# Distribution specific information.
5# 5#
6SILC_CLIENT_VERSION= 1.1.4 6SILC_CLIENT_VERSION= 1.1.7
7SILC_CLIENT_DISTNAME= silc-client-${SILC_CLIENT_VERSION} 7SILC_CLIENT_DISTNAME= silc-client-${SILC_CLIENT_VERSION}
8SILC_CLIENT_EXTRACT_SUFX= .tar.bz2 8SILC_CLIENT_EXTRACT_SUFX= .tar.bz2
9SILC_CLIENT_DISTFILE= ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX} 9SILC_CLIENT_DISTFILE= ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX}
10 10
11# These files are generated during silc-client's build, but are required by 11# These files are generated during silc-client's build, but are required by
12# plugins to compile properly. 12# plugins to compile properly.
13# 13#
14SILC_CLIENT_CONFIG= ${PREFIX}/share/silc-client/irssi-config 14SILC_CLIENT_CONFIG= ${PREFIX}/share/silc-client/irssi-config
15SILC_CLIENT_CONFIG_H= ${PREFIX}/share/silc-client/config.h 15SILC_CLIENT_CONFIG_H= ${PREFIX}/share/silc-client/config.h
cvs diff -r1.23 -r1.24 pkgsrc/chat/silc-client/PLIST (switch to unified diff)

--- pkgsrc/chat/silc-client/PLIST 2008/07/13 12:04:11 1.23
+++ pkgsrc/chat/silc-client/PLIST 2009/01/12 06:46:43 1.24
@@ -1,119 +1,119 @@ @@ -1,119 +1,119 @@
1@comment $NetBSD: PLIST,v 1.23 2008/07/13 12:04:11 tonnerre Exp $ 1@comment $NetBSD: PLIST,v 1.24 2009/01/12 06:46:43 tonnerre Exp $
2bin/silc 2bin/silc
3lib/silc-client/libsilc.la 3lib/silc-client/libsilc.la
4lib/silc-client/libsilcclient.la 4lib/silc-client/libsilcclient.la
5man/man1/silc.1 5man/man1/silc.1
6share/doc/silc-client/CHANGES 
7share/doc/silc-client/COPYING 6share/doc/silc-client/COPYING
8share/doc/silc-client/CREDITS 7share/doc/silc-client/CREDITS
 8share/doc/silc-client/ChangeLog
9share/doc/silc-client/FAQ 9share/doc/silc-client/FAQ
10share/doc/silc-client/INSTALL 10share/doc/silc-client/INSTALL
11share/doc/silc-client/README 11share/doc/silc-client/README
12share/doc/silc-client/README.PLUGIN 12share/doc/silc-client/README.PLUGIN
13share/doc/silc-client/TODO 13share/doc/silc-client/TODO
14share/doc/silc-client/formats.txt 14share/doc/silc-client/formats.txt
15share/doc/silc-client/manual.txt 15share/doc/silc-client/manual.txt
16share/doc/silc-client/signals.txt 16share/doc/silc-client/signals.txt
17share/doc/silc-client/special_vars.txt 17share/doc/silc-client/special_vars.txt
18share/doc/silc-client/startup-HOWTO.html 18share/doc/silc-client/startup-HOWTO.html
19share/examples/silc-client/silc.conf.default 19share/examples/silc-client/silc.conf.default
20share/silc-client/config.h 20share/silc-client/config.h
21share/silc-client/help/action 21share/silc-client/help/action
22share/silc-client/help/admin 22share/silc-client/help/admin
23share/silc-client/help/alias 23share/silc-client/help/alias
24share/silc-client/help/attr 24share/silc-client/help/attr
25share/silc-client/help/away 25share/silc-client/help/away
26share/silc-client/help/ban 26share/silc-client/help/ban
27share/silc-client/help/beep 27share/silc-client/help/beep
28share/silc-client/help/bind 28share/silc-client/help/bind
29share/silc-client/help/cat 29share/silc-client/help/cat
30share/silc-client/help/cd 30share/silc-client/help/cd
31share/silc-client/help/channel 31share/silc-client/help/channel
32share/silc-client/help/clear 32share/silc-client/help/clear
33share/silc-client/help/close 33share/silc-client/help/close
34share/silc-client/help/cmode 34share/silc-client/help/cmode
35share/silc-client/help/connect 35share/silc-client/help/connect
36share/silc-client/help/cumode 36share/silc-client/help/cumode
37share/silc-client/help/cycle 37share/silc-client/help/cycle
38share/silc-client/help/date 38share/silc-client/help/date
39share/silc-client/help/dehilight 39share/silc-client/help/dehilight
40share/silc-client/help/detach 40share/silc-client/help/detach
41share/silc-client/help/disconnect 41share/silc-client/help/disconnect
42share/silc-client/help/echo 42share/silc-client/help/echo
43share/silc-client/help/eval 43share/silc-client/help/eval
44share/silc-client/help/exec 44share/silc-client/help/exec
45share/silc-client/help/file 45share/silc-client/help/file
46share/silc-client/help/format 46share/silc-client/help/format
47share/silc-client/help/getkey 47share/silc-client/help/getkey
48share/silc-client/help/help 48share/silc-client/help/help
49share/silc-client/help/hilight 49share/silc-client/help/hilight
50share/silc-client/help/ignore 50share/silc-client/help/ignore
51share/silc-client/help/info 51share/silc-client/help/info
52share/silc-client/help/invite 52share/silc-client/help/invite
53share/silc-client/help/invitelist 53share/silc-client/help/invitelist
54share/silc-client/help/join 54share/silc-client/help/join
55share/silc-client/help/key 55share/silc-client/help/key
56share/silc-client/help/kick 56share/silc-client/help/kick
57share/silc-client/help/kickban 57share/silc-client/help/kickban
58share/silc-client/help/kill 58share/silc-client/help/kill
59share/silc-client/help/knockout 59share/silc-client/help/knockout
60share/silc-client/help/lastlog 60share/silc-client/help/lastlog
61share/silc-client/help/layout 61share/silc-client/help/layout
62share/silc-client/help/levels 62share/silc-client/help/levels
63share/silc-client/help/list 63share/silc-client/help/list
64share/silc-client/help/listkeys 64share/silc-client/help/listkeys
65share/silc-client/help/load 65share/silc-client/help/load
66share/silc-client/help/log 66share/silc-client/help/log
67share/silc-client/help/me 67share/silc-client/help/me
68share/silc-client/help/mmsg 68share/silc-client/help/mmsg
69share/silc-client/help/motd 69share/silc-client/help/motd
70share/silc-client/help/msg 70share/silc-client/help/msg
71share/silc-client/help/names 71share/silc-client/help/names
72share/silc-client/help/nick 72share/silc-client/help/nick
73share/silc-client/help/notice 73share/silc-client/help/notice
74share/silc-client/help/oper 74share/silc-client/help/oper
75share/silc-client/help/part 75share/silc-client/help/part
76share/silc-client/help/perlflush 76share/silc-client/help/perlflush
77share/silc-client/help/ping 77share/silc-client/help/ping
78share/silc-client/help/query 78share/silc-client/help/query
79share/silc-client/help/quit 79share/silc-client/help/quit
80share/silc-client/help/recode 80share/silc-client/help/recode
81share/silc-client/help/reconnect 81share/silc-client/help/reconnect
82share/silc-client/help/reload 82share/silc-client/help/reload
83share/silc-client/help/rmreconns 83share/silc-client/help/rmreconns
84share/silc-client/help/rmrejoins 84share/silc-client/help/rmrejoins
85share/silc-client/help/save 85share/silc-client/help/save
86share/silc-client/help/sconnect 86share/silc-client/help/sconnect
87share/silc-client/help/script 87share/silc-client/help/script
88share/silc-client/help/scrollback 88share/silc-client/help/scrollback
89share/silc-client/help/server 89share/silc-client/help/server
90share/silc-client/help/set 90share/silc-client/help/set
91share/silc-client/help/shutdown 91share/silc-client/help/shutdown
92share/silc-client/help/silcnet 92share/silc-client/help/silcnet
93share/silc-client/help/silcoper 93share/silc-client/help/silcoper
94share/silc-client/help/smsg 94share/silc-client/help/smsg
95share/silc-client/help/stats 95share/silc-client/help/stats
96share/silc-client/help/statusbar 96share/silc-client/help/statusbar
97share/silc-client/help/toggle 97share/silc-client/help/toggle
98share/silc-client/help/topic 98share/silc-client/help/topic
99share/silc-client/help/umode 99share/silc-client/help/umode
100share/silc-client/help/unalias 100share/silc-client/help/unalias
101share/silc-client/help/unignore 101share/silc-client/help/unignore
102share/silc-client/help/unload 102share/silc-client/help/unload
103share/silc-client/help/unquery 103share/silc-client/help/unquery
104share/silc-client/help/users 104share/silc-client/help/users
105share/silc-client/help/version 105share/silc-client/help/version
106share/silc-client/help/watch 106share/silc-client/help/watch
107share/silc-client/help/whois 107share/silc-client/help/whois
108share/silc-client/help/whowas 108share/silc-client/help/whowas
109share/silc-client/help/window 109share/silc-client/help/window
110share/silc-client/irssi-config 110share/silc-client/irssi-config
111share/silc-client/themes/default.theme 111share/silc-client/themes/default.theme
112share/silc-client/themes/plugin.theme 112share/silc-client/themes/plugin.theme
113@dirrm share/silc-client/themes 113@dirrm share/silc-client/themes
114@dirrm share/silc-client/help 114@dirrm share/silc-client/help
115@dirrm share/silc-client 115@dirrm share/silc-client
116@dirrm share/examples/silc-client 116@dirrm share/examples/silc-client
117@dirrm share/doc/silc-client 117@dirrm share/doc/silc-client
118@dirrm lib/silc-client/modules 118@dirrm lib/silc-client/modules
119@dirrm lib/silc-client 119@dirrm lib/silc-client
cvs diff -r1.32 -r1.33 pkgsrc/chat/silc-client/distinfo (switch to unified diff)

--- pkgsrc/chat/silc-client/distinfo 2008/07/13 12:04:11 1.32
+++ pkgsrc/chat/silc-client/distinfo 2009/01/12 06:46:43 1.33
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.32 2008/07/13 12:04:11 tonnerre Exp $ 1$NetBSD: distinfo,v 1.33 2009/01/12 06:46:43 tonnerre Exp $
2 2
3SHA1 (silc-client-1.1.4.tar.bz2) = 043fd02ffc0bb420d411c4ca14ad307b48beaa06 3SHA1 (silc-client-1.1.7.tar.bz2) = 3d6ebdeaea98a728cd225114c972116c8746fb72
4RMD160 (silc-client-1.1.4.tar.bz2) = 519ba59912da4bb514330ca8e87979844f957ad0 4RMD160 (silc-client-1.1.7.tar.bz2) = 06bb20b4ee795b814fc0fb73c07b3ae19b9b4e71
5Size (silc-client-1.1.4.tar.bz2) = 1624696 bytes 5Size (silc-client-1.1.7.tar.bz2) = 1528679 bytes
6SHA1 (patch-aa) = 59bfbaf78235e919b4e09f194d88d029630a4160 6SHA1 (patch-aa) = 59bfbaf78235e919b4e09f194d88d029630a4160
7SHA1 (patch-ab) = 873c65a78da7195b8baddb33d1c71300fce704f1 7SHA1 (patch-ab) = 873c65a78da7195b8baddb33d1c71300fce704f1
8SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8 8SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8
9SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755 9SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755
10SHA1 (patch-ae) = b437cb3433093592573802e70b600c7556ee5834 10SHA1 (patch-ae) = b437cb3433093592573802e70b600c7556ee5834