summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-01-28 21:23:25 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-01-28 21:23:25 +0000
commit23e92173ae488ee83df77f428f5aaa666a3ec1cb (patch)
tree6cf4f29569bbe8c6014278b59eb3f7683b906dc5 /net-print/mtink
parentversion bump, fixes bug #397597 thanks to Mao PU for reporting. (diff)
downloadgentoo-2-23e92173ae488ee83df77f428f5aaa666a3ec1cb.tar.gz
gentoo-2-23e92173ae488ee83df77f428f5aaa666a3ec1cb.tar.bz2
gentoo-2-23e92173ae488ee83df77f428f5aaa666a3ec1cb.zip
Fix buffer overflow, bug 342799, and make call
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'net-print/mtink')
-rw-r--r--net-print/mtink/ChangeLog10
-rw-r--r--net-print/mtink/files/mtink-1.0.16-overflow.patch11
-rw-r--r--net-print/mtink/metadata.xml1
-rw-r--r--net-print/mtink/mtink-1.0.16-r1.ebuild (renamed from net-print/mtink/mtink-1.0.16.ebuild)11
4 files changed, 27 insertions, 6 deletions
diff --git a/net-print/mtink/ChangeLog b/net-print/mtink/ChangeLog
index d1bd9a2ab956..34325b0b5ff4 100644
--- a/net-print/mtink/ChangeLog
+++ b/net-print/mtink/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-print/mtink
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.33 2011/06/05 19:38:17 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.34 2012/01/28 21:23:25 dilfridge Exp $
+
+*mtink-1.0.16-r1 (28 Jan 2012)
+
+ 28 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> -mtink-1.0.16.ebuild,
+ +mtink-1.0.16-r1.ebuild, +files/mtink-1.0.16-overflow.patch, metadata.xml:
+ Fix buffer overflow, bug 342799, and make call
05 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> mtink-1.0.16.ebuild,
+files/mtink-1.0.16-options.patch:
diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch
new file mode 100644
index 000000000000..181ab0d789d4
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch
@@ -0,0 +1,11 @@
+--- server/mtinkd.c.orig 2012-01-15 13:03:41.000000000 +0000
++++ server/mtinkd.c 2012-01-15 13:03:58.000000000 +0000
+@@ -244,7 +244,7 @@
+ /* look for pid into /var/run/mtink(<fifo> */
+ if ( (fp = fopen(runFile,"r")) )
+ {
+- if ( fgets(ibuf, sizeof(buf), fp) )
++ if ( fgets(ibuf, sizeof(ibuf), fp) )
+ {
+ if ( (pid = atoi(ibuf)) )
+ {
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
index 1fa0ca569505..688fe2cc3d7f 100644
--- a/net-print/mtink/metadata.xml
+++ b/net-print/mtink/metadata.xml
@@ -2,4 +2,5 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>printing</herd>
+<maintainer><email>SebastianLuther@gmx.de</email></maintainer>
</pkgmetadata>
diff --git a/net-print/mtink/mtink-1.0.16.ebuild b/net-print/mtink/mtink-1.0.16-r1.ebuild
index f29bf67bf1c6..b49c047134ca 100644
--- a/net-print/mtink/mtink-1.0.16.ebuild
+++ b/net-print/mtink/mtink-1.0.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.16.ebuild,v 1.3 2011/06/05 19:38:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.16-r1.ebuild,v 1.1 2012/01/28 21:23:25 dilfridge Exp $
EAPI=4
inherit eutils base
@@ -22,7 +22,10 @@ DEPEND="X? ( x11-libs/libX11
dev-libs/libusb"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-options.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-options.patch"
+ "${FILESDIR}/${P}-overflow.patch"
+)
src_configure() {
./Configure || die
@@ -36,7 +39,7 @@ src_compile() {
mytargets="${mytargets} mtink mtinkc";
fi
- make ${mytargets} || die "Compile problem"
+ emake ${mytargets}
}
src_install() {