cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 1.12

Browse Source 
with fixes from Simon Kunhle
from brad@
This commit is contained in:
simon 2007-10-01 22:03:53 +00:00
parent e692aa37ef
commit 83df55eb22
12 changed files with 81 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/silc-client/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.41 2007/09/01 20:11:21 kili Exp $
# $OpenBSD: Makefile,v 1.42 2007/10/01 22:03:53 simon Exp $
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.0.4.1
PKGNAME= ${DISTNAME}p0
DISTNAME= silc-client-1.1.2
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/
@ -25,9 +24,8 @@ MASTER_SITES= http://ftp.silcnet.org/client/sources/ \
http://the.wiretapped.net/security/network-security/silc/client/sources/ \
ftp://ftp.wiretapped.net/pub/security/network-security/silc/client/sources/
LIB_DEPENDS+= glib.>=1.2,gmodule.>=1.2::devel/glib
MODULES= converters/libiconv
MODULES= devel/gettext
LIB_DEPENDS+= glib-2.0.>=1000.0,gmodule-2.0.>=1000.0::devel/glib2
CONFDIR= ${SYSCONFDIR}/silc
SUBST_VARS= CONFDIR
@ -35,11 +33,11 @@ SUBST_VARS= CONFDIR
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-shared
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --enable-ipv6 \
--docdir=${PREFIX}/share/doc/silc \
--sysconfdir=${CONFDIR} \
--with-helpdir=${PREFIX}/share/silc/help \
--with-docdir=${PREFIX}/share/doc/silc \
--with-etcdir=${CONFDIR} \
--with-iconv=${LOCALBASE} \
--without-libtoolfix \
--with-perl=no

10
net/silc-client/distinfo
View File

@ -1,5 +1,5 @@
MD5 (silc-client-1.0.4.1.tar.gz) = MVSStAPtOxvQALgWXlrg0g==
RMD160 (silc-client-1.0.4.1.tar.gz) = uU8P46b7QpB7eszC/4FhqJ8ILYo=
SHA1 (silc-client-1.0.4.1.tar.gz) = LyzteYgvXxLkpOPqH42qIeVgndY=
SHA256 (silc-client-1.0.4.1.tar.gz) = JWn3VgCOxI33s4MArBvwPLKJHvKwsRtnt2KyGQlXv2k=
SIZE (silc-client-1.0.4.1.tar.gz) = 1973143
MD5 (silc-client-1.1.2.tar.gz) = orFkXzG6ZW7Qk+steHquqg==
RMD160 (silc-client-1.1.2.tar.gz) = 0mg29KR6UVHfiZfX16dngXb+gTc=
SHA1 (silc-client-1.1.2.tar.gz) = Ywy7Hgs72XgqoYVPIaN3B7a6uEE=
SHA256 (silc-client-1.1.2.tar.gz) = eeXCgCyYxCT3rqEiH3i+Bk7oWl16cX2E6csHFjh2lb4=
SIZE (silc-client-1.1.2.tar.gz) = 2208026

19
net/silc-client/patches/patch-apps_irssi_docs_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-apps_irssi_docs_Makefile_in,v 1.1 2006/10/03 18:34:50 brad Exp $
--- apps/irssi/docs/Makefile.in.orig Fri Jan 6 08:46:28 2006
+++ apps/irssi/docs/Makefile.in Tue Oct 3 14:20:37 2006
@@ -313,12 +313,12 @@ distclean-libtool:
uninstall-info-am:
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+ test -z "$(docdir)" || $(mkdir_p) "$(docdir)"
@list='$(doc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ echo " $(docDATA_INSTALL) '$$d$$p' '$(docdir)/$$f'"; \
+ $(docDATA_INSTALL) "$$d$$p" "$(docdir)/$$f"; \
done
uninstall-docDATA:

19
net/silc-client/patches/patch-apps_irssi_docs_help_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-apps_irssi_docs_help_Makefile_in,v 1.1 2006/10/03 18:34:50 brad Exp $
--- apps/irssi/docs/help/Makefile.in.orig Fri Jan 6 08:46:28 2006
+++ apps/irssi/docs/help/Makefile.in Tue Oct 3 14:20:37 2006
@@ -403,12 +403,12 @@ distclean-libtool:
uninstall-info-am:
install-helpDATA: $(help_DATA)
@$(NORMAL_INSTALL)
- test -z "$(helpdir)" || $(mkdir_p) "$(DESTDIR)$(helpdir)"
+ test -z "$(helpdir)" || $(mkdir_p) "$(helpdir)"
@list='$(help_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \
- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \
+ echo " $(helpDATA_INSTALL) '$$d$$p' '$(helpdir)/$$f'"; \
+ $(helpDATA_INSTALL) "$$d$$p" "$(helpdir)/$$f"; \
done
uninstall-helpDATA:

12
net/silc-client/patches/patch-apps_irssi_src_fe-common_core_fe-common-core_c Normal file
View File

@ -0,0 +1,12 @@
--- apps/irssi/src/fe-common/core/fe-common-core.c.orig Fri Jul 27 13:21:58 2007
+++ apps/irssi/src/fe-common/core/fe-common-core.c Fri Jul 27 13:22:30 2007
@@ -176,7 +176,8 @@
settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
settings_add_str("lookandfeel", "term_charset",
- *nl_langinfo(CODESET) != '\0' ?
+ ((*nl_langinfo(CODESET) != '\0') &&
+ (strcmp(nl_langinfo(CODESET), "646") != 0)) ? /* ASCII */
nl_langinfo(CODESET) : "ISO8859-1");
#else
settings_add_str("lookandfeel", "term_charset", "ISO8859-1");

13
net/silc-client/patches/patch-apps_irssi_src_fe-common_core_fe-recode_c Normal file
View File

@ -0,0 +1,13 @@
--- apps/irssi/src/fe-common/core/fe-recode.c.orig Fri Jul 27 13:55:52 2007
+++ apps/irssi/src/fe-common/core/fe-recode.c Fri Jul 27 13:56:54 2007
@@ -182,8 +182,8 @@
g_free(term_charset);
#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) :
- *nl_langinfo(CODESET) != '\0' ? g_strdup(nl_langinfo(CODESET)) :
- "ISO8859-1";
+ ((*nl_langinfo(CODESET) != '\0') && (strcmp(nl_langinfo(CODESET), "646") != 0)) ?
+ g_strdup(nl_langinfo(CODESET)) : "ISO8859-1";
#else
term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : "ISO8859-1";
#endif

17
net/silc-client/patches/patch-configure_ac
View File

@ -1,15 +1,14 @@
$OpenBSD: patch-configure_ac,v 1.2 2007/04/01 20:43:59 steven Exp $
--- configure.ac.orig Wed Mar 7 20:02:19 2007
+++ configure.ac Sun Apr 1 22:30:31 2007
@@ -455,8 +455,9 @@ if test -n "$with_silc_includes" || test -n "$with_sil
$OpenBSD: patch-configure_ac,v 1.3 2007/10/01 22:03:53 simon Exp $
--- configure.ac.orig Thu Jun 28 12:54:19 2007
+++ configure.ac Sat Jun 30 15:15:40 2007
@@ -605,8 +605,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
else
# pkg-config check
- PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
- PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
+ compile_libs=true
- PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true)
- PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true)
+ #PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true)
if test x$compile_libs = xfalse; then
LIBSUBDIR=

21
net/silc-client/patches/patch-doc_Makefile_in
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2007/03/21 11:24:02 martynas Exp $
--- doc/Makefile.in.orig Wed Mar 7 21:02:19 2007
+++ doc/Makefile.in Sat Mar 17 18:29:19 2007
@@ -272,6 +272,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
with_irssi_FALSE = @with_irssi_FALSE@
with_irssi_TRUE = @with_irssi_TRUE@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2007/10/01 22:03:53 simon Exp $
--- doc/Makefile.in.orig Thu Jun 28 12:54:19 2007
+++ doc/Makefile.in Sat Jun 30 15:13:22 2007
@@ -225,7 +225,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = $(DESTDIR)$(DOCDIR)
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
EXTRA_DIST = silc.1 FAQ silcalgs.conf draft-riikonen*.txt
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

10
net/silc-client/patches/patch-lib_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-lib_Makefile_in,v 1.9 2006/10/03 18:34:50 brad Exp $
--- lib/Makefile.in.orig Fri Jan 6 08:46:28 2006
+++ lib/Makefile.in Tue Oct 3 14:20:37 2006
@@ -577,7 +577,6 @@ install-data-am:
$OpenBSD: patch-lib_Makefile_in,v 1.10 2007/10/01 22:03:53 simon Exp $
--- lib/Makefile.in.orig Thu Jun 28 12:54:19 2007
+++ lib/Makefile.in Sat Jun 30 15:13:22 2007
@@ -573,7 +573,6 @@ install-dvi: install-dvi-recursive
install-exec-am:
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-info: install-info-recursive
install-html: install-html-recursive

10
net/silc-client/patches/patch-lib_silcmath_tma_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_silcmath_tma_c,v 1.1 2006/10/03 18:34:50 brad Exp $
--- lib/silcmath/tma.c.orig Sun Apr 24 11:24:12 2005
+++ lib/silcmath/tma.c Tue Oct 3 14:20:26 2006
@@ -1488,6 +1488,7 @@ mp_count_bits (mp_int * a)
* Tom St Denis, tomstdenis@iahu.ca, http://math.libtomcrypt.org
$OpenBSD: patch-lib_silcmath_tma_c,v 1.2 2007/10/01 22:03:53 simon Exp $
--- lib/silcmath/tma.c.orig Thu May 3 11:13:16 2007
+++ lib/silcmath/tma.c Wed Jun 13 22:55:31 2007
@@ -1570,6 +1570,7 @@ tma_mp_count_bits (tma_mp_int * a)
* Tom St Denis, tomstdenis@gmail.com, http://libtom.org
*/
+#define BN_MP_DIV_SMALL

25
net/silc-client/patches/patch-lib_silcutil_silcutf8_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-lib_silcutil_silcutf8_c,v 1.2 2007/04/01 20:43:59 steven Exp $
--- lib/silcutil/silcutf8.c.orig Sun Apr 3 14:27:55 2005
+++ lib/silcutil/silcutf8.c Sun Apr 1 22:30:27 2007
@@ -565,15 +565,19 @@ bool silc_utf8_strncasecmp(const char *s1, const char
if (s1 == s2)
return TRUE;
+ s1u = memchr(s1, '\0', n);
+ s1u_len = (s1u == NULL) ? n : (s1u - (unsigned char *)s1);
/* Casefold and normalize */
- status = silc_stringprep(s1, strlen(s1), SILC_STRING_UTF8,
+ status = silc_stringprep(s1, s1u_len, SILC_STRING_UTF8,
SILC_IDENTIFIERC_PREP, 0, &s1u,
&s1u_len, SILC_STRING_UTF8);
if (status != SILC_STRINGPREP_OK)
return FALSE;
+ s2u = memchr(s2, '\0', n);
+ s2u_len = (s2u == NULL) ? n : (s2u - (unsigned char *)s2);
/* Casefold and normalize */
- status = silc_stringprep(s2, strlen(s2), SILC_STRING_UTF8,
+ status = silc_stringprep(s2, s2u_len, SILC_STRING_UTF8,
SILC_IDENTIFIERC_PREP, 0, &s2u,
&s2u_len, SILC_STRING_UTF8);
if (status != SILC_STRINGPREP_OK)

28
net/silc-client/pkg/PLIST
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.19 2007/03/21 11:24:02 martynas Exp $
@comment $OpenBSD: PLIST,v 1.20 2007/10/01 22:03:53 simon Exp $
bin/silc
@man man/man1/silc.1
@comment modules/
share/doc/silc/
@comment share/doc/silc/CHANGES
@comment share/doc/silc/COPYING
@ -9,13 +8,8 @@ share/doc/silc/
share/doc/silc/FAQ
@comment share/doc/silc/INSTALL
share/doc/silc/README
share/doc/silc/README.PLUGIN
@comment share/doc/silc/TODO
@comment share/doc/silc/draft-riikonen-presence-attrs-03.txt
@comment share/doc/silc/draft-riikonen-silc-commands-06.txt
@comment share/doc/silc/draft-riikonen-silc-flags-payloads-04.txt
@comment share/doc/silc/draft-riikonen-silc-ke-auth-08.txt
@comment share/doc/silc/draft-riikonen-silc-pp-09.txt
@comment share/doc/silc/draft-riikonen-silc-spec-08.txt
share/doc/silc/formats.txt
share/doc/silc/manual.txt
share/doc/silc/signals.txt
@ -86,6 +80,7 @@ share/silc/help/perlflush
share/silc/help/ping
share/silc/help/query
share/silc/help/quit
share/silc/help/recode
share/silc/help/reconnect
share/silc/help/reload
share/silc/help/rmreconns
@ -117,13 +112,20 @@ share/silc/help/whowas
share/silc/help/window
share/silc/scripts/
share/silc/scripts/autoop.pl
share/silc/scripts/beep.pl
share/silc/scripts/clones.pl
share/silc/scripts/autorejoin.pl
share/silc/scripts/buf.pl
share/silc/scripts/command.pl
share/silc/scripts/dns.pl
share/silc/scripts/hello.pl
share/silc/scripts/mail-maildir.pl
share/silc/scripts/kills.pl
share/silc/scripts/mail.pl
share/silc/scripts/silc-mime.pl
share/silc/scripts/mlock.pl
share/silc/scripts/msg-event.pl
share/silc/scripts/quitmsg.pl
share/silc/scripts/redirect.pl
share/silc/scripts/scriptassist.pl
share/silc/scripts/silc.pl
share/silc/scripts/splitlong.pl
share/silc/scripts/usercount.pl
share/silc/themes/
share/silc/themes/default.theme
share/silc/themes/plugin.theme