Fix fujiplay-1.33-unterminated-strings.patch, thanks to Philanthrop, Bug 109226

Package-Manager: portage-2.1.2_rc2

5 files changed, 57 insertions, 55 deletions

diff --git a/app-misc/fujiplay/ChangeLog b/app-misc/fujiplay/ChangeLog
index 7290f9b14a46..84b6c081232f 100644
--- a/app-misc/fujiplay/ChangeLog
+++ b/app-misc/fujiplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/fujiplay
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/ChangeLog,v 1.8 2005/01/08 13:57:42 griffon26 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/ChangeLog,v 1.9 2006/11/25 01:11:15 masterdriverz Exp $
+
+  25 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/fujiplay-1.33-unterminated-strings.patch:
+  Fix fujiplay-1.33-unterminated-strings.patch, thanks to Philanthrop, Bug 109226
 
   08 Jan 2005; Maurice van der Pot <griffon26@gentoo.org> +metadata.xml,
   +files/fujiplay-1.33-unterminated-strings.patch, fujiplay-1.33.ebuild:
diff --git a/app-misc/fujiplay/Manifest b/app-misc/fujiplay/Manifest
index 431fd5c0f7f0..78f31f4c5b09 100644
--- a/app-misc/fujiplay/Manifest
+++ b/app-misc/fujiplay/Manifest
@@ -1,20 +1,20 @@
-AUX fujiplay-1.33-unterminated-strings.patch 3118 RMD160 5a942f35f2423e1439552590bf5b519d5ec36d3c SHA1 4156d109774a3f76457de7322ed42c542e64180d SHA256 685ca863cb967a7acf080f289ed2fc5963af966d08a80bf2c77aa6f5009891fb
-MD5 c7c94e811dfa5dc89f6dfb37935a2d29 files/fujiplay-1.33-unterminated-strings.patch 3118
-RMD160 5a942f35f2423e1439552590bf5b519d5ec36d3c files/fujiplay-1.33-unterminated-strings.patch 3118
-SHA256 685ca863cb967a7acf080f289ed2fc5963af966d08a80bf2c77aa6f5009891fb files/fujiplay-1.33-unterminated-strings.patch 3118
-DIST fujiplay.tgz 12588
-EBUILD fujiplay-1.33.ebuild 1128 RMD160 fef8bf5fb9c6f706b6919b057cbf7eeb36763cb7 SHA1 95d84f3f2a3aa36bb0836cbfc10e7a5804749105 SHA256 1450f0fe7bc5bdf157b74d4660ba5cfb6321d55b3fa119d144d6f565a8090064
-MD5 64618929aad7f9c6780ee7d382d2ff91 fujiplay-1.33.ebuild 1128
-RMD160 fef8bf5fb9c6f706b6919b057cbf7eeb36763cb7 fujiplay-1.33.ebuild 1128
-SHA256 1450f0fe7bc5bdf157b74d4660ba5cfb6321d55b3fa119d144d6f565a8090064 fujiplay-1.33.ebuild 1128
-MISC ChangeLog 715 RMD160 97735cda6150050bec2d8edb01db35bcc87397f0 SHA1 b3761f9155ab4f9c6e7401ee536fa0408ec04037 SHA256 ff8344a6854503ba93894d9074e96b6449862df097aec9af11babfe20f5de5e5
-MD5 8c27d29e3690fda6867bc1348aac92d7 ChangeLog 715
-RMD160 97735cda6150050bec2d8edb01db35bcc87397f0 ChangeLog 715
-SHA256 ff8344a6854503ba93894d9074e96b6449862df097aec9af11babfe20f5de5e5 ChangeLog 715
+AUX fujiplay-1.33-unterminated-strings.patch 3214 RMD160 bd8a625a796f47b95f31a76139f8ff9ce1bb188d SHA1 4e2308544f2a0826809a04096652c89747c732ba SHA256 e14ad7d1907a1f9cf58b50f8a6183cfb61d5fda6df528fed2cbaf7f86f981303
+MD5 04a772c0595368de19301a698fbb5d1e files/fujiplay-1.33-unterminated-strings.patch 3214
+RMD160 bd8a625a796f47b95f31a76139f8ff9ce1bb188d files/fujiplay-1.33-unterminated-strings.patch 3214
+SHA256 e14ad7d1907a1f9cf58b50f8a6183cfb61d5fda6df528fed2cbaf7f86f981303 files/fujiplay-1.33-unterminated-strings.patch 3214
+DIST fujiplay.tgz 12588 RMD160 91cbf301bd8e67a5753748d675ee1294c7d31ad7 SHA1 6a2a42a87bb78d5eeeb040afb72636aa0aed692c SHA256 d65c473b799532169d6ff362c24ee81f98efa2d2031bbcb8b638606701e75438
+EBUILD fujiplay-1.33.ebuild 1099 RMD160 bed32bc4f0b963fff6a25531f86fc87b30a8fbd4 SHA1 aa5707ff22232dc8aa0fb8556f6f0d9a7d15d2ac SHA256 68a27fe99854a03d3584438a0165f6d0230a3f86b7c43b0fb14a2402679656b5
+MD5 4432ba94c2b2139c07b664070607fa1b fujiplay-1.33.ebuild 1099
+RMD160 bed32bc4f0b963fff6a25531f86fc87b30a8fbd4 fujiplay-1.33.ebuild 1099
+SHA256 68a27fe99854a03d3584438a0165f6d0230a3f86b7c43b0fb14a2402679656b5 fujiplay-1.33.ebuild 1099
+MISC ChangeLog 911 RMD160 b03c80cd1ad96e536980e7f44549e37bfcb1cd4b SHA1 5ada04218d2e4a022c939fc2bccd942df04b044b SHA256 0a69e3e3239b545d4c42b77937be16e9141fb4556859ab47c0d2da2db3318f50
+MD5 9d1c3499c9d4d2c8e22858af42f75ab7 ChangeLog 911
+RMD160 b03c80cd1ad96e536980e7f44549e37bfcb1cd4b ChangeLog 911
+SHA256 0a69e3e3239b545d4c42b77937be16e9141fb4556859ab47c0d2da2db3318f50 ChangeLog 911
 MISC metadata.xml 311 RMD160 bfddf7409cde9869749748809a39b8a9452e5341 SHA1 e5bf7c70d7447a947184318cf2a55472730f0f2c SHA256 681abaed7fabc30bb145bc6ea96ef506bcbe5a29be69ff370d25494e73fe1431
 MD5 b64b7af24e806692804b0a20f88ad534 metadata.xml 311
 RMD160 bfddf7409cde9869749748809a39b8a9452e5341 metadata.xml 311
 SHA256 681abaed7fabc30bb145bc6ea96ef506bcbe5a29be69ff370d25494e73fe1431 metadata.xml 311
-MD5 ffd323c4305177a6b06eeb23eb59b8cc files/digest-fujiplay-1.33 56
-RMD160 3f2bc4070f392e262f84974c65efeaa0602184e0 files/digest-fujiplay-1.33 56
-SHA256 8fba5ad430383c66acd8ad89994f6c3744e3ab0b6ddb8ba593eae0c0d224fbf3 files/digest-fujiplay-1.33 56
+MD5 85044ab5c326391e6a0ae4e5d7fc17aa files/digest-fujiplay-1.33 214
+RMD160 793bdc785a3ce8afc64e224f84d2e308b996eb4b files/digest-fujiplay-1.33 214
+SHA256 b3d6e2053b406528b8024f2adb6a8cf68b1fa8f48989a07383f76eeaeb60e3aa files/digest-fujiplay-1.33 214
diff --git a/app-misc/fujiplay/files/digest-fujiplay-1.33 b/app-misc/fujiplay/files/digest-fujiplay-1.33
index 189257ca8215..672f92cfb6ed 100644
--- a/app-misc/fujiplay/files/digest-fujiplay-1.33
+++ b/app-misc/fujiplay/files/digest-fujiplay-1.33
@@ -1 +1,3 @@
 MD5 b5702d555813853ff63918ed285c4cdd fujiplay.tgz 12588
+RMD160 91cbf301bd8e67a5753748d675ee1294c7d31ad7 fujiplay.tgz 12588
+SHA256 d65c473b799532169d6ff362c24ee81f98efa2d2031bbcb8b638606701e75438 fujiplay.tgz 12588
diff --git a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
index 5fb87be1474c..7f03c696c20e 100644
--- a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
+++ b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
@@ -1,5 +1,5 @@
 --- fujiplay.c	1999-02-23 10:30:31.000000000 +0100
-+++ fujiplay-fixed.c	2005-01-08 14:37:08.711951696 +0100
++++ fujiplay.c	2006-08-05 00:50:08.000000000 +0200
 @@ -759,40 +759,38 @@
  	return 1;
  }
@@ -38,37 +38,37 @@
 -Written by Thierry Bousch <bousch@topo.math.u-psud.fr>
 -Public domain. Absolutely no warranty.
 -";
-+const char *Usage =
-+"Usage: fujiplay [OPTIONS] PICTURES...          (download)\n"
-+"                          charge NUMBER        (recharge the flash)\n"
-+"                          shoot                (take picture)\n"
-+"                          preview              (preview to standard output)\n"
-+"                          upload FILES...\n"
-+"                          delete FILES...\n"
-+"                          setid STRING         (set camera ID)\n"
-+"                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto)\n"
-+"                          setdate gmt|local|YYYYMMDDHHMMSS\n"
-+"Options:\n"
-+"  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)\n"
-+"  -D DEVICE	Select another device file (default is /dev/fujifilm)\n"
-+"  -L		List command set\n"
-+"  -7		DS-7 compatibility mode (experimental)\n"
-+"  -d		Delete pictures after successful download\n"
-+"  -f		Force (overwrite existing files)\n"
-+"  -p		Assume picture numbers instead of frame numbers\n"
-+"  -h		Display this help message\n"
-+"  -v		Version information\n"
-+"Pictures:\n"
-+"  all		All pictures\n"
-+"  last		Last picture\n"
-+"  4		Only picture 4\n"
-+"  2-10		Pictures between 2 and 10\n"
-+"Files:\n"
-+"  DSCxxxxx.JPG	Files to delete or to upload into the camera\n";
++const char *Usage = "\n" \
++"Usage: fujiplay [OPTIONS] PICTURES...          (download) \n" \
++"                          charge NUMBER        (recharge the flash) \n" \
++"                          shoot                (take picture) \n" \
++"                          preview              (preview to standard output) \n" \
++"                          upload FILES... \n" \
++"                          delete FILES... \n" \
++"                          setid STRING         (set camera ID) \n" \
++"                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto) \n" \
++"                          setdate gmt|local|YYYYMMDDHHMMSS \n" \
++"Options: \n" \
++"  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) \n" \
++"  -D DEVICE	Select another device file (default is /dev/fujifilm) \n" \
++"  -L		List command set \n" \
++"  -7		DS-7 compatibility mode (experimental) \n" \
++"  -d		Delete pictures after successful download \n" \
++"  -f		Force (overwrite existing files) \n" \
++"  -p		Assume picture numbers instead of frame numbers \n" \
++"  -h		Display this help message \n" \
++"  -v		Version information \n" \
++"Pictures: \n" \
++"  all		All pictures \n" \
++"  last		Last picture \n" \
++"  4		Only picture 4 \n" \
++"  2-10		Pictures between 2 and 10 \n" \
++"Files: \n" \
++"  DSCxxxxx.JPG	Files to delete or to upload into the camera \n";
 +
-+const char *Copyright =
-+"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n"
-+"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
++const char *Copyright = "\n" \
++"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" \
++"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n" \
 +"Public domain. Absolutely no warranty.\n";
  
  static void sigint_handler (int sig)
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
index 44d97aeccd92..c52486e0faa8 100644
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.11 2005/01/08 13:57:42 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.12 2006/11/25 01:11:15 masterdriverz Exp $
 
 inherit eutils
 
@@ -24,10 +24,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-unterminated-strings.patch
 }
 
-src_compile() {
-	emake || die
-}
-
 src_install() {
 	dobin fujiplay yycc2ppm || die
 	dodoc README fujiplay.lsm mx700-commands.html