Bug #329047: Patching out some dead code which triggers unnecessary security-related warnings.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 159 insertions, 16 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index b85e1206b650..856ad5a3f3fe 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.187 2011/08/08 17:58:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.188 2011/09/21 19:00:03 phosphan Exp $
+
+  21 Sep 2011; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.21-r1.ebuild, sane-backends-1.0.22-r1.ebuild,
+  +files/niash_array_index.patch:
+  Bug #329047: Patching out some dead code which triggers unnecessary
+  security-related warnings.
 
   08 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
   sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r2.ebuild,
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c1e310f43d1d..035e1f616209 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.0.20-unbreak-udev.diff 688 RMD160 467154092c84c81c6444b788fa9a10d909930a84 SHA1 63d5f52ae04e17a9d1722d55f6e1b6f8ca5094a4 SHA256 467a170a9f4c5d825893029607dcdcb45110c3f2838e9ee230fdbbc1f8f0567e
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
 AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
 AUX genesys_io.patch 918 RMD160 fe105f644eec67a8626db78820a79f51c55ff2ca SHA1 6b75065e2db52ebc7ea58c89e4b4738a016c5b28 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7
+AUX niash_array_index.patch 4141 RMD160 31f84f470b4aecbfec00cdb72cb382481d092f41 SHA1 27edb0c70d8e2dc7e2e2403e164a9c1cc5681aab SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187
 AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
 AUX sane-backends-1.0.22-libv4l-0.8.3.patch 999 RMD160 8b0a462c87e577cd4e1ae9cadb60c9b8fa340970 SHA1 7550b1a85bd127fa47218c002347b91680b7f1fc SHA256 bbfeaead9ed58110974c01d79b0b723e7fb34b9c4c73b1a78672b56376ca82bd
 AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 RMD160 8b5547706e391226c33f8fcaa451c384844afba8 SHA1 1e10c4057d839e7a6263d5721b4b47984d7cbb88 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0
@@ -27,14 +25,9 @@ EBUILD sane-backends-1.0.17.ebuild 3761 RMD160 f07ceda376d30bb977b5cbe120a4acd72
 EBUILD sane-backends-1.0.18-r6.ebuild 4279 RMD160 535498ff058528e063cbf8b4b1d7298fbf83b5f3 SHA1 5b677d4beeaba8223527cdbce576421d11b426ef SHA256 0b75e057f5c35ac8c4f180d5b555d7d4eb7294b8bcd1871cd370783ca2d444cb
 EBUILD sane-backends-1.0.19-r2.ebuild 4483 RMD160 192804949969312f480d2f0326a8240a2a8da6ff SHA1 00dded7755b057d129e7abbe6fbc5cd590943c4e SHA256 7b854ad0036baa9dc699aec4914291f4091857a919fa4759db80271f27d66816
 EBUILD sane-backends-1.0.20-r3.ebuild 4415 RMD160 10e2474a3797cab9e13b19677ce211062c160f3a SHA1 2837fcf49e028163c7aaab4a694f57d950f0cff9 SHA256 d4408cc17a8b838c059c7062c2c86bb7e11df7295ca8f5a6c91647b29040aaa1
-EBUILD sane-backends-1.0.21-r1.ebuild 4641 RMD160 fe0fa0fbeb1d2836379af62bea985461fb85302b SHA1 ac489d62b2e61b9d986bf33c359d18dbd6d443df SHA256 864f82c84673185907982c8192ecc8a6f253a9917dd0a8a768a4ebc901631ddf
-EBUILD sane-backends-1.0.22-r1.ebuild 4608 RMD160 14a3afad17e7393e97bdd9b059d4512284a01b69 SHA1 f17643a2696efeb535e56915eaf7f729f8434576 SHA256 87891b61fc1596fbb87e211579f9e5dc0d675d28b869e157dcc05d07d2fe51b1
-MISC ChangeLog 32307 RMD160 beff086eb0af38ba5238347fcc4db2d60ffcf70e SHA1 7f486f9f160c2e68d3643ecb5f56675a1955f682 SHA256 b2c8387f7c651477d692f039b886ad52ea0360f8a87743496ea0dcf25bb16174
+EBUILD sane-backends-1.0.21-r1.ebuild 4702 RMD160 1f15d10eecc8abbb8bc034802b27fd58b31cd059 SHA1 b24e46251e4e5a6d53611ec65fd6ba8d6b2707c3 SHA256 b6a109e96f4af203f4dfc073324d7ad62b62297f1e1a5f67b362ae82dfccdb84
+EBUILD sane-backends-1.0.22-r1.ebuild 4669 RMD160 76dfa6d7cc89b3bf4dfe72d8512a5534c7cf6890 SHA1 17bc30ef594a55b6009419ce43e5b58e16cc64a4 SHA256 9223d30065348683a7488ab997dfe9cd8dc52ba809e5d5aaa442a3d53acbdd06
+MISC ChangeLog 32560 RMD160 c09058c2ac550f7952455e6244d176fc2668787e SHA1 9eb1a24854cd63224d4c4072b8f43fd06d5865ef SHA256 d196b60b1d82d2340f4901c9e732fbbdfa8863b069b03125f85ca7ab43d2592f
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk5AI/IACgkQFYEBGcdFJfILMQD9HzrlZiCJdbKTzcc6r8Wx4ShR
-PBoMbMOZpLzI3jRal+0A/RA4G+SCrV/uqeKx6iVMOt5P8/Fnqr24tM1N9HVMO5n0
-=Boe1
------END PGP SIGNATURE-----
+MISC sane-backends-1.0.21-r1.ebuild.orig 4641 RMD160 fe0fa0fbeb1d2836379af62bea985461fb85302b SHA1 ac489d62b2e61b9d986bf33c359d18dbd6d443df SHA256 864f82c84673185907982c8192ecc8a6f253a9917dd0a8a768a4ebc901631ddf
+MISC sane-backends-1.0.21-r1.ebuild.rej 383 RMD160 ab238c107d34c87d9f2fd21e6b68117650d2fc08 SHA1 57ff56131cb4b464ca14a8c7d001e06376a249c4 SHA256 0ff45e0af845e8a245b5b36c559b507a1ae752098a8587d0dcde184f3c59194f
diff --git a/media-gfx/sane-backends/files/niash_array_index.patch b/media-gfx/sane-backends/files/niash_array_index.patch
new file mode 100644
index 000000000000..236c4598b581
--- /dev/null
+++ b/media-gfx/sane-backends/files/niash_array_index.patch
@@ -0,0 +1,140 @@
+--- backend/niash.c	2010-12-02 00:49:58.000000000 +0100
++++ backend/niash.c.new	2011-09-21 20:09:07.000000000 +0200
+@@ -82,14 +82,7 @@
+   optThreshold,
+ 
+ 
+-  optLast,
+-/* put temporarily disabled options here after optLast */
+-
+-  optGroupMisc,
+-  optLamp,
+-
+-  optCalibrate,
+-  optGamma                      /* analog gamma = single number */
++  optLast
+ } EOptionIndex;
+ 
+ 
+@@ -685,17 +678,6 @@
+           pDesc->size = 0;
+           break;
+ 
+-        case optGamma:
+-          pDesc->name = SANE_NAME_ANALOG_GAMMA;
+-          pDesc->title = SANE_TITLE_ANALOG_GAMMA;
+-          pDesc->desc = SANE_DESC_ANALOG_GAMMA;
+-          pDesc->type = SANE_TYPE_FIXED;
+-          pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
+-          pDesc->constraint.range = &rangeGamma;
+-          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+-          pVal->w = startUpGamma;
+-          break;
+-
+         case optGammaTable:
+           pDesc->name = SANE_NAME_GAMMA_VECTOR;
+           pDesc->title = SANE_TITLE_GAMMA_VECTOR;
+@@ -707,31 +689,6 @@
+           pVal->wa = s->aGammaTable;
+           break;
+ 
+-        case optGroupMisc:
+-          pDesc->title = SANE_I18N ("Miscellaneous");
+-          pDesc->type = SANE_TYPE_GROUP;
+-          pDesc->size = 0;
+-          break;
+-
+-        case optLamp:
+-          pDesc->name = "lamp";
+-          pDesc->title = SANE_I18N ("Lamp status");
+-          pDesc->desc = SANE_I18N ("Switches the lamp on or off.");
+-          pDesc->type = SANE_TYPE_BOOL;
+-          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+-          /* switch the lamp on when starting for first the time */
+-          pVal->w = SANE_TRUE;
+-          break;
+-
+-        case optCalibrate:
+-          pDesc->name = "calibrate";
+-          pDesc->title = SANE_I18N ("Calibrate");
+-          pDesc->desc = SANE_I18N ("Calibrates for black and white level.");
+-          pDesc->type = SANE_TYPE_BUTTON;
+-          pDesc->cap = SANE_CAP_SOFT_SELECT;
+-          pDesc->size = 0;
+-          break;
+-
+         case optGroupMode:
+           pDesc->title = SANE_I18N ("Scan Mode");
+           pDesc->desc = "";
+@@ -1007,7 +964,6 @@
+           /* Get options of type SANE_Word */
+         case optCount:
+         case optDPI:
+-        case optGamma:
+         case optTLX:
+         case optTLY:
+         case optBRX:
+@@ -1031,17 +987,6 @@
+           strcpy ((char *) pVal, modeList[s->aValues[optMode].w]);
+           break;
+ 
+-          /* Get options of type SANE_Bool */
+-        case optLamp:
+-          GetLamp (&s->HWParams, &fLampIsOn);
+-          *(SANE_Bool *) pVal = fLampIsOn;
+-          break;
+-
+-        case optCalibrate:
+-          /*  although this option has nothing to read,
+-             it's added here to avoid a warning when running scanimage --help */
+-          break;
+-
+         default:
+           DBG (DBG_MSG, "SANE_ACTION_GET_VALUE: Invalid option (%d)\n", n);
+         }
+@@ -1061,7 +1006,6 @@
+         case optCount:
+           return SANE_STATUS_INVAL;
+ 
+-        case optGamma:
+         case optThreshold:
+         case optDPI:
+ 
+@@ -1089,15 +1033,7 @@
+           DBG (DBG_MSG,
+                "sane_control_option: SANE_ACTION_SET_VALUE %d = %d\n", n,
+                (int) s->aValues[n].w);
+-          if (n == optGamma)
+-            {
+-              if (!fSame && optLast > optGammaTable)
+-                {
+-                  info |= SANE_INFO_RELOAD_OPTIONS;
+-                }
+-              _SetScalarGamma (s->aGammaTable, s->aValues[n].w);
+-            }
+-          break;
++         break;
+ 
+         case optGammaTable:
+           DBG (DBG_MSG, "Writing gamma table\n");
+@@ -1158,20 +1094,6 @@
+           break;
+ 
+ 
+-
+-        case optLamp:
+-          fVal = *(SANE_Bool *) pVal;
+-          DBG (DBG_MSG, "lamp %s\n", fVal ? "on" : "off");
+-          if (fVal)
+-            _WarmUpLamp (s, WARMUP_INSESSION);
+-          else
+-            SetLamp (&s->HWParams, SANE_FALSE);
+-          break;
+-
+-        case optCalibrate:
+-/*       SimpleCalib(&s->HWParams); */
+-          break;
+-
+         default:
+           DBG (DBG_ERR, "SANE_ACTION_SET_VALUE: Invalid option (%d)\n", n);
+         }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
index e62e8d3080e7..93883a4f1b3a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.12 2011/08/08 17:58:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.13 2011/09/21 19:00:03 phosphan Exp $
 
 EAPI="1"
 
@@ -163,6 +163,8 @@ src_unpack() {
 	epatch "${FILESDIR}/xerox-grey.patch"
 	# Bug #356919
 	epatch "${FILESDIR}"/${PN}-1.0.22-libv4l-0.8.3.patch
+	# Bug #329047
+	epatch "${FILESDIR}"/niash_array_index.patch
 }
 
 src_compile() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
index ac31857fe831..0b80343223f8 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild,v 1.3 2011/08/08 17:58:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild,v 1.4 2011/09/21 19:00:03 phosphan Exp $
 
 EAPI="4"
 
@@ -152,6 +152,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-xerox_mfp-usb.patch
 	# Bug #356919
 	epatch "${FILESDIR}"/${P}-libv4l-0.8.3.patch
+	# Bug #329047
+	epatch "${FILESDIR}"/niash_array_index.patch
 }
 
 src_configure() {