summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2004-04-27 08:30:49 +0000
committeragc <agc@pkgsrc.org>2004-04-27 08:30:49 +0000
commit7c021780a0ebb871f9b0c488bcef1268d7b3b567 (patch)
treea5a9fa4df7f5a8c8dfea3d59eb925c80bf7cc180
parentd5c01aba904f9084202826b21b132b5e4f90fdf2 (diff)
downloadpkgsrc-7c021780a0ebb871f9b0c488bcef1268d7b3b567.tar.gz
Pull up a security fix to the pkgsrc-2004Q1 branch.
Requested by fredb in ticket pkgsrc-19. "Update uudeview and friends to 0.5.20. Fixes a few serious bugs in uulib, including buffer overrun errors, and adds a handful of little improvements to the library and programs." and "Bump the share library version number to 2.0 for the addition of UULoadFileWithPartNo(), with apologies to anyone who's updated within the last three minutes."
-rw-r--r--converters/uudeview/Makefile4
-rw-r--r--converters/uudeview/distinfo6
-rw-r--r--converters/uulib/Makefile6
-rw-r--r--converters/uulib/PLIST6
-rw-r--r--converters/uulib/buildlink2.mk4
-rw-r--r--converters/uulib/distinfo8
-rw-r--r--converters/uulib/patches/patch-aa14
-rw-r--r--converters/xdeview/Makefile7
-rw-r--r--converters/xdeview/distinfo8
-rw-r--r--converters/xdeview/patches/patch-ad15
-rw-r--r--converters/xdeview/patches/patch-ae15
11 files changed, 62 insertions, 31 deletions
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 70417cf9632..e59338b9fe4 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 21:27:41 grant Exp $
+# $NetBSD: Makefile,v 1.20.4.1 2004/04/27 08:30:49 agc Exp $
#
-DISTNAME= uudeview-0.5.18
+DISTNAME= uudeview-0.5.20
CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
diff --git a/converters/uudeview/distinfo b/converters/uudeview/distinfo
index 0d3cd797cb3..6c6a26136c6 100644
--- a/converters/uudeview/distinfo
+++ b/converters/uudeview/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/08/31 16:54:34 wiz Exp $
+$NetBSD: distinfo,v 1.5.6.1 2004/04/27 08:30:49 agc Exp $
-SHA1 (uudeview-0.5.18.tar.gz) = 357c6adc20ef247c0a7745c42318230e90b16790
-Size (uudeview-0.5.18.tar.gz) = 260889 bytes
+SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
+Size (uudeview-0.5.20.tar.gz) = 261574 bytes
SHA1 (patch-aa) = bf7e281b7e0e2ceae6bc8c19c9e64cdb7d5a9d64
SHA1 (patch-ab) = bdd62a84d0f62c697dd4440df861c343ffeb683a
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 8c4d1256a9e..7a644bda445 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/01/20 12:10:29 agc Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2004/04/27 08:30:49 agc Exp $
#
-DISTNAME= uudeview-0.5.18
-PKGNAME= uulib-0.5.18
+DISTNAME= uudeview-0.5.20
+PKGNAME= uulib-0.5.20
CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
diff --git a/converters/uulib/PLIST b/converters/uulib/PLIST
index af903aefd72..1ea7ae79db7 100644
--- a/converters/uulib/PLIST
+++ b/converters/uulib/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:51:16 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1.12.1 2004/04/27 08:30:49 agc Exp $
include/uu.h
lib/libuu.a
lib/libuu.la
lib/libuu.so
-lib/libuu.so.1
-lib/libuu.so.1.0
+lib/libuu.so.2
+lib/libuu.so.2.0
man/man3/uulib.3
share/doc/uulib/HISTORY
share/doc/uulib/Makefile
diff --git a/converters/uulib/buildlink2.mk b/converters/uulib/buildlink2.mk
index a7932e7e6d8..07df760e111 100644
--- a/converters/uulib/buildlink2.mk
+++ b/converters/uulib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/08/31 16:54:33 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3.6.1 2004/04/27 08:30:49 agc Exp $
.if !defined(UULIB_BUILDLINK2_MK)
UULIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= uulib
-BUILDLINK_DEPENDS.uulib?= uulib>=0.5.18
+BUILDLINK_DEPENDS.uulib?= uulib>=0.5.20
BUILDLINK_PKGSRCDIR.uulib?= ../../converters/uulib
EVAL_PREFIX+= BUILDLINK_PREFIX.uulib=uulib
diff --git a/converters/uulib/distinfo b/converters/uulib/distinfo
index 05dfe8116ad..1716fda3160 100644
--- a/converters/uulib/distinfo
+++ b/converters/uulib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/08/31 16:54:33 wiz Exp $
+$NetBSD: distinfo,v 1.5.6.1 2004/04/27 08:30:49 agc Exp $
-SHA1 (uudeview-0.5.18.tar.gz) = 357c6adc20ef247c0a7745c42318230e90b16790
-Size (uudeview-0.5.18.tar.gz) = 260889 bytes
-SHA1 (patch-aa) = 2a60a00bb2bc4078063d285df65a5d4b906582c5
+SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
+Size (uudeview-0.5.20.tar.gz) = 261574 bytes
+SHA1 (patch-aa) = abdf06e9088a519eb56d3b052bc2f96e72db15fd
diff --git a/converters/uulib/patches/patch-aa b/converters/uulib/patches/patch-aa
index 183e02e5d25..bb845470a74 100644
--- a/converters/uulib/patches/patch-aa
+++ b/converters/uulib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:17 agc Exp $
+$NetBSD: patch-aa,v 1.3.12.1 2004/04/27 08:30:50 agc Exp $
---- Makefile.in.orig Mon Jul 20 10:54:23 1998
-+++ Makefile.in Mon Jul 20 10:55:55 1998
-@@ -20,7 +20,7 @@
+--- Makefile.in.orig 2002-03-11 03:15:46.000000000 -0600
++++ Makefile.in
+@@ -19,7 +19,7 @@ SHELL = /bin/sh
#
# If you don't have the GNU C compiler installed, set CC=cc here
#
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:17 agc Exp $
#
# C Compiler Options
#
-@@ -52,11 +52,11 @@
+@@ -51,11 +51,11 @@ UULIB_OBJ = ${UULIB_SOURCE:.c=.o}
.SUFFIXES:
.SUFFIXES: .c .o
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:17 agc Exp $
distclean: clean
rm -f config.status config.cache config.log Makefile config.h
-@@ -65,13 +65,13 @@
+@@ -64,13 +64,13 @@ distclean: clean
realclean: distclean
new: clean
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:17 agc Exp $
- ar r $@ $(UULIB_OBJ)
- -$(RANLIB) $@
+ $(CC) -o libuu.la $(UULIB_OBJ:.o=.lo) -rpath $(PREFIX)/lib \
-+ -version-info 1:0
++ -version-info 2:0
.c.o:
$(CC) -c $(CFLAGS) $(VDEF) $<
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 157fa16bf27..042d2ba1aa8 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/03/12 10:37:19 tron Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2004/04/27 08:30:50 agc Exp $
-DISTNAME= uudeview-0.5.18
-PKGNAME= xdeview-0.5.18
-PKGREVISION= 2
+DISTNAME= uudeview-0.5.20
+PKGNAME= xdeview-0.5.20
CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
diff --git a/converters/xdeview/distinfo b/converters/xdeview/distinfo
index 89aee3e81e8..af82533474b 100644
--- a/converters/xdeview/distinfo
+++ b/converters/xdeview/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/08/31 16:54:34 wiz Exp $
+$NetBSD: distinfo,v 1.5.6.1 2004/04/27 08:30:50 agc Exp $
-SHA1 (uudeview-0.5.18.tar.gz) = 357c6adc20ef247c0a7745c42318230e90b16790
-Size (uudeview-0.5.18.tar.gz) = 260889 bytes
+SHA1 (uudeview-0.5.20.tar.gz) = 2c6ab7d355b545218bd0877d598bd5327d9fd125
+Size (uudeview-0.5.20.tar.gz) = 261574 bytes
SHA1 (patch-ab) = dea2e56b811327e61264627852e1b6bb1eb6a643
SHA1 (patch-ac) = 57e2b11157b47abfdc2a2f71444feb42e8c012eb
+SHA1 (patch-ad) = a3e0892498aa0db7c3271824b44bce7bf725aee8
+SHA1 (patch-ae) = fb89ccadfcc3cf9a9ef0addfa29def0a2924a673
diff --git a/converters/xdeview/patches/patch-ad b/converters/xdeview/patches/patch-ad
new file mode 100644
index 00000000000..542239a3af1
--- /dev/null
+++ b/converters/xdeview/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.3.4.1 2004/04/27 08:31:37 agc Exp $
+
+--- configure.in.orig 2004-03-01 17:06:18.000000000 -0600
++++ configure.in
+@@ -275,8 +275,8 @@ fi
+ if test "x$have_tk" != "xno" ; then
+ tklibflag=`eval echo $TK_LIB_FLAG`
+ TCL_CPPFLAGS="-I$tk_h_dir $TK_XINCLUDES $TCL_CPPFLAGS"
+- TCL_LDFLAGS="-L$tk_lib_dir $TCL_LDFLAGS"
+- TCL_LIBS="$tklibflag $TCL_LIBS"
++ TCL_LDFLAGS="$TK_LIB_SPEC $TCL_LDFLAGS"
++ TCL_LIBS="$tklibflag $TCL_LIBS $TK_LIBS"
+ AC_DEFINE(HAVE_TK)
+ fi
+
diff --git a/converters/xdeview/patches/patch-ae b/converters/xdeview/patches/patch-ae
new file mode 100644
index 00000000000..7ee5dc43d70
--- /dev/null
+++ b/converters/xdeview/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.2.2 2004/04/27 08:31:37 agc Exp $
+
+--- configure.orig 2004-03-01 17:06:18.000000000 -0600
++++ configure
+@@ -1422,8 +1422,8 @@ fi
+ if test "x$have_tk" != "xno" ; then
+ tklibflag=`eval echo $TK_LIB_FLAG`
+ TCL_CPPFLAGS="-I$tk_h_dir $TK_XINCLUDES $TCL_CPPFLAGS"
+- TCL_LDFLAGS="-L$tk_lib_dir $TCL_LDFLAGS"
+- TCL_LIBS="$tklibflag $TCL_LIBS"
++ TCL_LDFLAGS="$TK_LIB_SPEC $TCL_LDFLAGS"
++ TCL_LIBS="$tklibflag $TCL_LIBS $TK_LIBS"
+ cat >> confdefs.h <<\EOF
+ #define HAVE_TK 1
+ EOF