Fixed bug #174776. Thank Toralf Förster for report.

Package-Manager: portage-2.1.2.2

diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index 0081258900063442540e5bd598a030cc199d49d8..bc66eb41ab0e7bdcad8c16792f0c6e642277d615 100644 (file)
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.25 2007/02/08 21:12:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.26 2007/05/01 17:01:40 pva Exp $
+
+*dos2unix-3.1-r2 (01 May 2007)
+
+  01 May 2007; <pva@gentoo.org>
+  +files/dos2unix-3.1-workaround-rename-EXDEV.patch, -dos2unix-3.1.ebuild,
+  +dos2unix-3.1-r2.ebuild:
+  Fixed bug #174776. Thank Toralf Förster for report.
 
   08 Feb 2007; Fabian Groffen <grobian@gentoo.org> dos2unix-3.1.ebuild,
   dos2unix-3.1-r1.ebuild:

diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 3a689c8d343e07aeee27fafce3b6b2c9e9f26ff7..6f44bab837ab2c39494dc1c692cf1a49a1c1b8df 100644 (file)
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -18,6 +18,10 @@ AUX dos2unix-3.1-segfault.patch 2224 RMD160 3e3eeac46c48c60f66735e3e27d59e3c3ed9
 MD5 605908dec54eefae120882df1591c388 files/dos2unix-3.1-segfault.patch 2224
 RMD160 3e3eeac46c48c60f66735e3e27d59e3c3ed94839 files/dos2unix-3.1-segfault.patch 2224
 SHA256 5dc9baf89d9e3a90fe92294716ad276c0ce8c87654a6878478ea336ff1d54c19 files/dos2unix-3.1-segfault.patch 2224
+AUX dos2unix-3.1-workaround-rename-EXDEV.patch 1370 RMD160 be94a07a72fa83d337062f9a9c3768ff224bf886 SHA1 fce6d4979623862c42b31c188ee9af8c537e5522 SHA256 6e3df77c3d3e66d128de8205a20d09a081825a3bcca47cdebfc595a5844e2408
+MD5 fda6fa85065da680676c8478c5abed25 files/dos2unix-3.1-workaround-rename-EXDEV.patch 1370
+RMD160 be94a07a72fa83d337062f9a9c3768ff224bf886 files/dos2unix-3.1-workaround-rename-EXDEV.patch 1370
+SHA256 6e3df77c3d3e66d128de8205a20d09a081825a3bcca47cdebfc595a5844e2408 files/dos2unix-3.1-workaround-rename-EXDEV.patch 1370
 AUX dos2unix-3.1.patch 364 RMD160 0f54e32288ac308dbaa978c9166197e9c172c066 SHA1 6ccfb8773f0b1fd64c8b00bdde3f3d184f172dbb SHA256 4e8d6cec9b837681bf6dd3ce78f97f02ccb1dd22d066c9b3b96e8365f23049fd
 MD5 c84bee5adf468784b6b1fbd682c851f2 files/dos2unix-3.1.patch 364
 RMD160 0f54e32288ac308dbaa978c9166197e9c172c066 files/dos2unix-3.1.patch 364
@@ -27,21 +31,21 @@ EBUILD dos2unix-3.1-r1.ebuild 976 RMD160 2370444f6074e86ff8ab26d27a58306af7429e5
 MD5 18cc2fd69640ff0a54fae942095477d7 dos2unix-3.1-r1.ebuild 976
 RMD160 2370444f6074e86ff8ab26d27a58306af7429e53 dos2unix-3.1-r1.ebuild 976
 SHA256 49d26d115d20c1fecf321d05f142df4a0951d4cf417ad05abf6b69a90683c21a dos2unix-3.1-r1.ebuild 976
-EBUILD dos2unix-3.1.ebuild 864 RMD160 685f3cc2d0b399f62d50a9f58ebf6c2762891391 SHA1 a20ab163bcc2e1166fd88e9649c84c0dfac4fa91 SHA256 08338aa166a1c1c4c7c990e87103e6201c95fd67024aa27686561219a9567865
-MD5 ddeb375582cfc23dff1a761606219ddf dos2unix-3.1.ebuild 864
-RMD160 685f3cc2d0b399f62d50a9f58ebf6c2762891391 dos2unix-3.1.ebuild 864
-SHA256 08338aa166a1c1c4c7c990e87103e6201c95fd67024aa27686561219a9567865 dos2unix-3.1.ebuild 864
-MISC ChangeLog 2735 RMD160 c09393536212e39ea9a79a1468a4e630f5e1f075 SHA1 fa9fe5b682a84078e6fe9bced49588678ed960f9 SHA256 7dc01a543e9773aa9b6b6a392ab231feff8e29a94acd1b9d30f8e506c129dadd
-MD5 ccdbc9e5672ad690d5f8d8d4c4b1c0b3 ChangeLog 2735
-RMD160 c09393536212e39ea9a79a1468a4e630f5e1f075 ChangeLog 2735
-SHA256 7dc01a543e9773aa9b6b6a392ab231feff8e29a94acd1b9d30f8e506c129dadd ChangeLog 2735
+EBUILD dos2unix-3.1-r2.ebuild 1040 RMD160 2cc2331d0a4aad5cc8f58e05e0d0d062db1ef7c3 SHA1 afdd7cf861623696771c77fd8602158066ee861a SHA256 b44275e38a69af6766cebe0db90e36127fadefadd2e3cb6230f2f39902d20e51
+MD5 43a888743f303bcea42ad27c7e002e70 dos2unix-3.1-r2.ebuild 1040
+RMD160 2cc2331d0a4aad5cc8f58e05e0d0d062db1ef7c3 dos2unix-3.1-r2.ebuild 1040
+SHA256 b44275e38a69af6766cebe0db90e36127fadefadd2e3cb6230f2f39902d20e51 dos2unix-3.1-r2.ebuild 1040
+MISC ChangeLog 2953 RMD160 c395785108e53b5a242aa4d686b460a83e8d43e9 SHA1 6b361bec01e160f21b8f57dd483fa0e704c5dc8b SHA256 cda5827fd98fab186a8e3b842010d52ac03d5455ceac3c58d9f124c8129a105c
+MD5 4b041a29bb2929d7492c5c5011369f9a ChangeLog 2953
+RMD160 c395785108e53b5a242aa4d686b460a83e8d43e9 ChangeLog 2953
+SHA256 cda5827fd98fab186a8e3b842010d52ac03d5455ceac3c58d9f124c8129a105c ChangeLog 2953
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 metadata.xml 165
 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd metadata.xml 165
-MD5 61f3d38501b1dd5821d3e567ce68867e files/digest-dos2unix-3.1 238
-RMD160 10a1529d0bb8356918b4b29f1de6e86fa4e73c73 files/digest-dos2unix-3.1 238
-SHA256 f8175743ac9f37ff8271a145481c21382d469cb0f692b65f9bfa9baae47b760c files/digest-dos2unix-3.1 238
 MD5 61f3d38501b1dd5821d3e567ce68867e files/digest-dos2unix-3.1-r1 238
 RMD160 10a1529d0bb8356918b4b29f1de6e86fa4e73c73 files/digest-dos2unix-3.1-r1 238
 SHA256 f8175743ac9f37ff8271a145481c21382d469cb0f692b65f9bfa9baae47b760c files/digest-dos2unix-3.1-r1 238
+MD5 61f3d38501b1dd5821d3e567ce68867e files/digest-dos2unix-3.1-r2 238
+RMD160 10a1529d0bb8356918b4b29f1de6e86fa4e73c73 files/digest-dos2unix-3.1-r2 238
+SHA256 f8175743ac9f37ff8271a145481c21382d469cb0f692b65f9bfa9baae47b760c files/digest-dos2unix-3.1-r2 238

diff --git a/app-text/dos2unix/dos2unix-3.1-r2.ebuild b/app-text/dos2unix/dos2unix-3.1-r2.ebuild
new file mode 100644 (file)
index 0000000..507bfe1
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-3.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-3.1-r2.ebuild,v 1.1 2007/05/01 17:01:40 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="Dos2unix converts DOS or MAC text files to UNIX format"
+HOMEPAGE="none"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-text/hd2u"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}.patch
+       epatch "${FILESDIR}"/${P}-segfault.patch
+       epatch "${FILESDIR}"/${P}-includes.patch
+       epatch "${FILESDIR}"/${P}-preserve-file-modes.patch
+       epatch "${FILESDIR}"/${P}-manpage-update.patch
+       epatch "${FILESDIR}"/${P}-safeconv.patch
+       epatch "${FILESDIR}"/${P}-workaround-rename-EXDEV.patch
+       make -s clean || die
+}
+
+src_install() {
+       dobin dos2unix || die
+       dosym dos2unix /usr/bin/mac2unix
+
+       doman dos2unix.1
+       dosym dos2unix.1 /usr/share/man/man1/mac2unix.1
+}

diff --git a/app-text/dos2unix/dos2unix-3.1.ebuild b/app-text/dos2unix/dos2unix-3.1.ebuild
deleted file mode 100644 (file)
index 3489722..0000000
--- a/app-text/dos2unix/dos2unix-3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-3.1.ebuild,v 1.21 2007/02/08 21:12:38 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="Dos2unix converts DOS or MAC text files to UNIX format"
-HOMEPAGE="I HAVE NO HOME :("
-SRC_URI="http://www2.tripleg.net.au/dos2unix.builder/${P}.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-text/hd2u"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${P}.patch
-       epatch ${FILESDIR}/${P}-segfault.patch
-}
-
-src_compile() {
-       make clean || die
-       make CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-       dobin dos2unix || die
-       dosym dos2unix /usr/bin/mac2unix
-
-       doman dos2unix.1
-       dosym dos2unix.1.gz /usr/share/man/man1/mac2unix.1.gz
-}

diff --git a/app-text/dos2unix/files/digest-dos2unix-3.1 b/app-text/dos2unix/files/digest-dos2unix-3.1-r2
similarity index 100%
rename from app-text/dos2unix/files/digest-dos2unix-3.1
rename to app-text/dos2unix/files/digest-dos2unix-3.1-r2

diff --git a/app-text/dos2unix/files/dos2unix-3.1-workaround-rename-EXDEV.patch b/app-text/dos2unix/files/dos2unix-3.1-workaround-rename-EXDEV.patch
new file mode 100644 (file)
index 0000000..71a3a69
--- /dev/null
+++ b/app-text/dos2unix/files/dos2unix-3.1-workaround-rename-EXDEV.patch
@@ -0,0 +1,56 @@
+--- ./dos2unix.c.orig  2007-04-17 11:16:32.000000000 +0400
++++ ./dos2unix.c       2007-04-17 12:41:01.000000000 +0400
+@@ -279,7 +279,7 @@
+   int RetVal = 0;
+   FILE *InF = NULL;
+   FILE *TempF = NULL;
+-  char TempPath[16];
++  char *TempPath = (char *) malloc(sizeof(char) * strlen(ipInFN)+14);
+   struct stat StatBuf;
+   struct utimbuf UTimeBuf;
+   int fd;
+@@ -288,7 +288,8 @@
+   if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
+     RetVal = -1;
+ 
+-  strcpy (TempPath, "./d2utmpXXXXXX");
++  strcpy (TempPath, ipInFN);
++  strcat (TempPath, "_u2dtmpXXXXXX");
+   if((fd=mkstemp (TempPath))<0) {
+         perror("Failed to open output temp file");
+         RetVal = -1;
+@@ -349,6 +350,7 @@
+       RetVal = -1;
+     }
+   }
++  free (TempPath);
+   return RetVal;
+ }
+ 
+@@ -364,7 +366,7 @@
+   int RetVal = 0;
+   FILE *InF = NULL;
+   FILE *TempF = NULL;
+-  char TempPath[16];
++  char *TempPath = (char *) malloc(sizeof(char) * strlen(ipInFN)+14);
+   struct stat StatBuf;
+   struct utimbuf UTimeBuf;
+   mode_t mode = S_IRUSR | S_IWUSR;
+@@ -376,7 +378,8 @@
+   else
+     mode = StatBuf.st_mode;
+ 
+-  strcpy (TempPath, "./u2dtmpXXXXXX");
++  strcpy (TempPath, ipInFN);
++  strcat (TempPath, "_u2dtmpXXXXXX");
+   if((fd=mkstemp (TempPath))<0) {
+         perror("Failed to open output temp file");
+         RetVal = -1;
+@@ -442,6 +445,7 @@
+     }
+     RetVal = -1;
+   }
++  free (TempPath);
+   return RetVal;
+ }
+