Fix buffer overflow, bug 342799, and make call

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 44 insertions, 22 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/Manifest b/net-print/mtink/Manifest
index 20b56962a3c0..cea7abb4b269 100644
--- a/net-print/mtink/Manifest
+++ b/net-print/mtink/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX mtink-1.0.16-options.patch 1424 RMD160 eb36205ecd3bb314e913912238569913743e9df0 SHA1 e9239ab7ba44e60c6713347ce86ee99d1936010f SHA256 e5444b1ba75551b0e3db115b83bc099e7f96517e07695f27ba332d7c4cbd31ee
+AUX mtink-1.0.16-overflow.patch 422 RMD160 bb7beaa0ddae785a84be3da9e4bacfc7eba09b23 SHA1 2f1285f22b363728880493cfa7e1490c9aee6167 SHA256 27389544c7f061ab734d101f993575cef15196bc91782ed1cfe38d0e7e11b05b
 AUX mtinkd.confd 494 RMD160 c80040ef3454c8dc5bbb8b7f0a9967ed08103958 SHA1 d9e992153830acd0a81a4b3e07a89cfb523321bb SHA256 ec29de5a78956f9aa7e10a9aa035892a5d8cc8f31553975ac4212a711b719b5d
 AUX mtinkd.rc 439 RMD160 1f7337e129d61406de2a18b758325d9a3e717afa SHA1 477af109e8ae6f671e60d07de77d0c990d62aa03 SHA256 d7cf5e343d3a1fef40d650854d969510d236c9b0117c378fabc8efa647c74fbf
 DIST mtink-1.0.11.tar.gz 905081 RMD160 15afc62fe20663093af165c48e338a9172b5ae73 SHA1 83cee0cc93a5e3949478901bd2dc18ee190f8719 SHA256 e3c9e0fff5ea805a1d66e516082fdaf97d3c4f01cdaeeebee0151587da36962f
 DIST mtink-1.0.16.tar.gz 916315 RMD160 e23b4472b13aa10389d2e990335b018a0e223691 SHA1 f838c746ab88297b5e01e347fa958a44d622ff86 SHA256 187e8d145e818b4b56be203403f5fe28c02f899d30d92c58e82bcef311555ba2
 EBUILD mtink-1.0.11.ebuild 1621 RMD160 bf143fde91587d793dd8866b68023b958a8e2dd2 SHA1 23245f3ffa4fc9d93b57dff891793e25cc1f3267 SHA256 6015c2ff321eca60df648f29d6719040bde95fa8a4e5746026748c1766007919
-EBUILD mtink-1.0.16.ebuild 1628 RMD160 fd4a55a8151ae08ba0193e9127652e145fb52f19 SHA1 c548b2b8056f1cef54cdd91aaf0e31376845fb24 SHA256 1f78bea91ad48fde64597a0a5cbee7b0302badfc936876888e09ea81e22d4b51
-MISC ChangeLog 4258 RMD160 b6f168013540b392fa1404f5373b8b2cac47b70d SHA1 436461b2a33d6b0a98fa7ab5794a97c193687f94 SHA256 2914845519a1a34d89b7ec477a2b52ab5833716efdd9095adf0cb6aa293df140
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+EBUILD mtink-1.0.16-r1.ebuild 1643 RMD160 7c681b826353234b7f1bfb7d5325daad8b01be19 SHA1 df83fa9ce76263fe5de4f31d6b067986b0f71fbe SHA256 297a3fdd535e6f7d49b4a33928e95827189b28bc149c20f737b98890a2149729
+MISC ChangeLog 4496 RMD160 24231c58bd7dc40cec111b9f68de3c9e44a7e5cd SHA1 e516625bafc585b9bc129f24559c3a4e4f3b0f83 SHA256 c97008051a3a7ae5975ce02cfab85fe1b32e07481d7da11c37ab891196a93e4b
+MISC metadata.xml 224 RMD160 c9f4170e69f02002163c1c4dcee2010f80e0ca32 SHA1 3ce724de40adb009afd65dd5f5527fecad009024 SHA256 94c4f9538d8175bebfd6c2dd926066c350b0dd6ff8782a2b768594c890451c95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN69swAAoJENwGBM22xffeLxEP/ioFPQOn/KrWaLDSPlBfKZfd
-NpLjjff7AijKdSZkgs1nj5vWWsOfvH7VpZ6MlwuQgxYwXkJCZRhBf0nD17IAv0S4
-lz3h66IZsifiMK1u6Z8BIH3RR/jWHQqMGRpugB3zCjA+WyIeVhkQA/IbWXjrsv1w
-m3QndgBI/qZlDiTpZiLdc3Wh5wtviyYrZIUgycfvvX2+rGBKSEXX1u08i+tgRpib
-7eFAB59yytbFL1VMbFz31Uc5359u9w/UGzXfyY54mDDs+yeTSkV3rKTQ79gfDp1g
-a42q+kjPSz7170X5Y5OAOwfU0oaa9FRfYkEiWFKJOFbtm1H2TwWqEqVRjUziu+QG
-rlyr9Y3aPeOxHPkuQ1R3PZiRK8JV3Qso4VQSA4KLURuG8vwyQvgALpJ6cwYulT1M
-2ITFHYdpvueosySj8Yd06tP3afo/XBjwJqtCSSx3hamJ/Gc3DKiE8b03Ko/4R07o
-jE+TX4UzWjHPjlv3DpN9q1TtsjGT27pk9PkUXQONMUnsgmnyd0Vr2VT9D0UFZf5c
-Zbb1cNTxUHoDXOuPsMiuFeflwHU9XfguqDNDsKXVBg4mzTeoLN5RB7Jzs5AG2NFl
-yZcKRzqwTYA3gATczSw9kpNAQxIzalLEmw+jO36Dp7foZ9Uacd5NVC0MYaSXKgd3
-el/hUrDumiLGbvVls54k
-=Np2M
+iQIcBAEBCgAGBQJPJGecAAoJENwGBM22xffeGXUP/ijCV+nt/M3hUAdcjsJcH51u
+yFP5k7f0AdgrOn5yRq7Pk4MfRtTndDciZeyg515gZbYjl2yAoMQmijzrPBtLHJPJ
+RTi+NLM/ixTCYiSQZJeoABMxTTMSkTrNBCVAkcbUl5rqaBOlEnfQrP/3gkCZk5vV
+zcYqt/IdEcrKOzrG9fVNhP3lnm8R1so6fzIC5Z4OX0M9W9zJj7XE14LDb7A90ppE
+6c7I67xpjQgwV9L2aq5y7akZy49R3zSFmWoM4xQrjS7L+euxi+0v8+fGvElpZYJV
+ceQTKr0EyUO+eJq9VAlUvk+s1lrUWOijVO0R/t65bUcUi31qabTbwUWd2mRKU3nd
+lfgE2bQsuSNGdhisdQE92X3uiK89KdZc7dvb2Tug7LfBawFWs+St33uMOoUA5HIT
+o8jRzaEBoP5RibWeV4Y1o3+2vJjCSXEyiujJRqTjU6fds5jVjlBvzBNz2fHgotww
+UYIzQQIGDXBRQnzgpMP5KVHdB0PPQFHshf+WtTKopgjH9XZe3KzLrx4G+U5Ol007
+EK3QyG8JgO4yIFIdULoOxsc/4xSQ0MjIgb3iUkPXMiEQLjmYcbCuSa5KRlC1QC4G
+rmnR3UpC9t8lHC2Jx5rksBIdV0Odgd6eUrsI6S9ppfsVCqNBcHGk6hxPlgfLBEAl
+hHpEISTfGfEvtbiCLnEA
+=86eT
 -----END PGP SIGNATURE-----
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() {