integrate silc-client 1.1.8 into irssi-silc. contains a fix for
string format vulnerability in client entry handling.
This commit is contained in:
martynas
parent
c815b2d914
commit
dad80d544b
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2009/07/26 15:39:52 martynas Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2009/08/03 21:29:47 martynas Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= SILC plugin for irssi
|
||||
|
||||
DISTNAME= irssi-silc-1.1.7
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
DISTNAME= irssi-silc-1.1.8
|
||||
PKGNAME= ${DISTNAME}
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= http://mirrors.protection.cx/~martynas/
|
||||
MASTER_SITES= http://martynas.blarzwurst.de/distfiles/
|
||||
|
||||
BUILD_DEPENDS= ::devel/gettext \
|
||||
::devel/glib2
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (irssi-silc-1.1.7.tar.gz) = PXIxdqDGX7mP/RWyvM8xSw==
|
||||
RMD160 (irssi-silc-1.1.7.tar.gz) = rOhnsuv5tcoMYcjD17JMbNq47so=
|
||||
SHA1 (irssi-silc-1.1.7.tar.gz) = auwVjYbTlbDD17AffKA7SlYmbLs=
|
||||
SHA256 (irssi-silc-1.1.7.tar.gz) = jsiYQ4dssg6v3m7w1bCOBib4E2Egxrv2Iqh0c8YfOi8=
|
||||
SIZE (irssi-silc-1.1.7.tar.gz) = 2374516
|
||||
MD5 (irssi-silc-1.1.8.tar.gz) = c4pxUC/YTQpEU/Uyb/16Kw==
|
||||
RMD160 (irssi-silc-1.1.8.tar.gz) = 3eRpf71j6TqLpwGuscLOgFStRAA=
|
||||
SHA1 (irssi-silc-1.1.8.tar.gz) = vAhonF4TZuV+cWisvLjLLcaq0GA=
|
||||
SHA256 (irssi-silc-1.1.8.tar.gz) = fm/mVwMySUHERmt4Il+Ve/3dKkDtXXgYoU5X+mBrk98=
|
||||
SIZE (irssi-silc-1.1.8.tar.gz) = 2392640
|
||||
|
||||
@ -1,7 +1,88 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2007/11/18 17:36:18 martynas Exp $
|
||||
--- configure.ac.orig Tue Nov 6 16:45:06 2007
|
||||
+++ configure.ac Fri Nov 16 00:26:36 2007
|
||||
@@ -613,8 +613,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2009/08/03 21:29:47 martynas Exp $
|
||||
--- configure.ac.orig Sat Aug 1 09:53:41 2009
|
||||
+++ configure.ac Sun Aug 2 22:20:58 2009
|
||||
@@ -51,7 +51,7 @@ case "$target" in
|
||||
check_threads=true
|
||||
;;
|
||||
*-*-openbsd*)
|
||||
- check_threads=true
|
||||
+ check_threads=false
|
||||
;;
|
||||
*-*-*bsd*)
|
||||
check_threads=false
|
||||
@@ -97,9 +97,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
|
||||
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
|
||||
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
|
||||
|
||||
-# Control compiler optimizations
|
||||
-CFLAGS=`echo $CFLAGS | sed 's/-O[ 0123456789s]*//g'`
|
||||
-
|
||||
AC_PROG_CC
|
||||
AC_C_INLINE
|
||||
AC_C_CONST
|
||||
@@ -471,59 +468,9 @@ fi
|
||||
## Compiler and compiler flag checks
|
||||
##
|
||||
|
||||
-if test "$GCC"; then
|
||||
- # GCC specific options
|
||||
- if test "x$summary_debug" = "xyes"; then
|
||||
- SILC_ADD_CFLAGS(-g)
|
||||
- else
|
||||
- SILC_ADD_CFLAGS(-g)
|
||||
- fi
|
||||
- SILC_ADD_CFLAGS(-Wall -finline-functions)
|
||||
- SILC_ADD_CFLAGS(-Wno-pointer-sign)
|
||||
-else
|
||||
- # Other compilers
|
||||
- case "$target" in
|
||||
- alpha*-dec-osf*)
|
||||
- SILC_ADD_CFLAGS(-g3)
|
||||
- ;;
|
||||
- mips*-sgi-irix*)
|
||||
- SILC_ADD_CFLAGS(-g3)
|
||||
- ;;
|
||||
- *)
|
||||
- SILC_ADD_CFLAGS(-g)
|
||||
- ;;
|
||||
- esac
|
||||
+SILC_ADD_CFLAGS(-Wall -finline-functions)
|
||||
+SILC_ADD_CFLAGS(-Wno-pointer-sign)
|
||||
|
||||
- # Intel C++ Compiler needs -restrict
|
||||
- if test "x$CC" = "xicc"; then
|
||||
- SILC_ADD_CFLAGS(-restrict)
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-if test x$want_cc_optimizations = xtrue; then
|
||||
- if test "$GCC"; then
|
||||
- # GCC specific options
|
||||
- if test "x$summary_debug" = "xyes"; then
|
||||
- SILC_ADD_CFLAGS(-O)
|
||||
- else
|
||||
- SILC_ADD_CFLAGS(-O2)
|
||||
- fi
|
||||
- else
|
||||
- # Other compilers
|
||||
- case "$target" in
|
||||
- alpha*-dec-osf*)
|
||||
- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
|
||||
- ;;
|
||||
- mips*-sgi-irix*)
|
||||
- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
|
||||
- ;;
|
||||
- *)
|
||||
- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
#
|
||||
# Workaround a bug in GCC 2.x which causes memory exhaustion
|
||||
# when compiling sha1 with optimizations on UltraSPARC.
|
||||
@@ -616,8 +563,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
|
||||
|
||||
else
|
||||
# pkg-config check
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/01/11 02:05:54 martynas Exp $
|
||||
--- doc/Makefile.in.orig Sat Jan 10 18:11:36 2009
|
||||
+++ doc/Makefile.in Sat Jan 10 23:25:47 2009
|
||||
@@ -226,7 +226,7 @@ build_vendor = @build_vendor@
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.3 2009/08/03 21:29:47 martynas Exp $
|
||||
--- doc/Makefile.in.orig Sat Aug 1 09:53:41 2009
|
||||
+++ doc/Makefile.in Sun Aug 2 22:02:05 2009
|
||||
@@ -227,7 +227,7 @@ build_vendor = @build_vendor@
|
||||
builddir = @builddir@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-lib_Makefile_in,v 1.2 2009/01/11 02:05:54 martynas Exp $
|
||||
--- lib/Makefile.in.orig Sat Jan 10 18:11:36 2009
|
||||
+++ lib/Makefile.in Sat Jan 10 23:25:47 2009
|
||||
@@ -581,7 +581,6 @@ install-dvi: install-dvi-recursive
|
||||
$OpenBSD: patch-lib_Makefile_in,v 1.3 2009/08/03 21:29:47 martynas Exp $
|
||||
--- lib/Makefile.in.orig Sat Aug 1 09:53:41 2009
|
||||
+++ lib/Makefile.in Sun Aug 2 22:02:05 2009
|
||||
@@ -583,7 +583,6 @@ install-dvi: install-dvi-recursive
|
||||
|
||||
install-exec-am:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user