Hello community, here is the log from the commit of package unix2dos checked in at Thu Apr 13 15:47:56 CEST 2006. -------- --- unix2dos/unix2dos.changes 2006-01-25 21:42:27.000000000 +0100 +++ STABLE/unix2dos/unix2dos.changes 2006-04-11 12:22:54.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 11 12:22:11 CEST 2006 - pth@suse.de + +- Make unix2dos preserve file mode (bugzilla #119350) + +------------------------------------------------------------------- New: ---- unix2dos-2.2-file_mode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unix2dos.spec ++++++ --- /var/tmp/diff_new_pack.HGaxSx/_old 2006-04-13 15:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HGaxSx/_new 2006-04-13 15:46:55.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package unix2dos (Version 2.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,19 +13,21 @@ Name: unix2dos Summary: UNIX to DOS text file format converter Version: 2.2 -Release: 228 +Release: 236 License: distributable, Other License(s), see package Group: Productivity/Text/Convertors Source: unix2dos-2.2.src.tar.gz Patch0: unix2dos-mkstemp.patch Patch1: unix2dos-2.2-segfault.patch Patch2: unix2dos-2.2-manpage.patch +Patch3: unix2dos-2.2-file_mode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %prep %setup -q -c %patch -p1 -b .sec %patch1 -p1 -b .segf %patch2 -p1 -b .man +%patch3 -b .fmode perl -pi -e "s,^#endif.*,#endif,g;s,^#else.*,#else,g" *.[ch] %description @@ -39,16 +41,15 @@ %build -gcc $RPM_OPT_FLAGS -ounix2dos unix2dos.c +gcc %optflags -ounix2dos unix2dos.c %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} -install -m755 unix2dos $RPM_BUILD_ROOT%{_bindir} -install -m444 unix2dos.1 $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1} +install -m755 unix2dos %{buildroot}%{_bindir} +install -m444 unix2dos.1 %{buildroot}%{_mandir}/man1 %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf %buildroot %files %defattr(-,root,root,0755) @@ -57,6 +58,8 @@ %{_mandir}/*/* %changelog -n unix2dos +* Tue Apr 11 2006 - pth@suse.de +- Make unix2dos preserve file mode (bugzilla #119350) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Sep 29 2005 - dmueller@suse.de ++++++ unix2dos-2.2-file_mode.patch ++++++ --- unix2dos.c +++ unix2dos.c @@ -292,11 +292,14 @@ char TempPath[16]; struct stat StatBuf; struct utimbuf UTimeBuf; + mode_t mode = S_IRUSR | S_IWUSR; int fd; /* retrieve ipInFN file date stamp */ - if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf)) + if (stat(ipInFN, &StatBuf)) RetVal = -1; + else + mode = StatBuf.st_mode; strcpy (TempPath, "./u2dtmpXXXXXX"); if((fd=mkstemp (TempPath)) < 0) { @@ -304,6 +307,9 @@ RetVal = -1; } + if (!RetVal && fchmod (fd, mode) && fchmod (fd, S_IRUSR | S_IWUSR)) + RetVal = -1; + #ifdef DEBUG fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath); #endif DEBUG ++++++ unix2dos-2.2-manpage.patch ++++++ --- /var/tmp/diff_new_pack.HGaxSx/_old 2006-04-13 15:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HGaxSx/_new 2006-04-13 15:46:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- unix2dos-2.2/unix2dos.1.man Thu Jan 17 17:25:08 2002 -+++ unix2dos-2.2/unix2dos.1 Thu Jan 17 17:25:35 2002 +--- unix2dos-2.2/unix2dos.1 ++++ unix2dos-2.2/unix2dos.1 @@ -16,7 +16,7 @@ .SH DESCRIPTION ++++++ unix2dos-2.2-segfault.patch ++++++ --- /var/tmp/diff_new_pack.HGaxSx/_old 2006-04-13 15:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HGaxSx/_new 2006-04-13 15:46:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- unix2dos-2.2/unix2dos.c.segf Thu Jan 17 17:09:49 2002 -+++ unix2dos-2.2/unix2dos.c Thu Jan 17 17:12:47 2002 +--- unix2dos-2.2/unix2dos.c ++++ unix2dos-2.2/unix2dos.c @@ -131,9 +131,9 @@ * RetVal: NULL if failure * file stream otherwise ++++++ unix2dos-mkstemp.patch ++++++ --- /var/tmp/diff_new_pack.HGaxSx/_old 2006-04-13 15:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HGaxSx/_new 2006-04-13 15:46:55.000000000 +0200 @@ -1,5 +1,5 @@ ---- unix2dos-2.2/unix2dos.c.orig Fri Nov 17 13:29:24 2000 -+++ unix2dos-2.2/unix2dos.c Fri Nov 17 13:30:16 2000 +--- unix2dos-2.2/unix2dos.c ++++ unix2dos-2.2/unix2dos.c @@ -214,7 +214,7 @@ strcpy (TempPath, "./u2dtmp"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...