Accepting request 70910 from Base:System

- Open all fds with O_CLOEXEC. (forwarded request 70909 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/70910
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dos2unix?expand=0&rev=24

dos2unix-5.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03ae3f10826dcfc3f40c577b12a5aa7c97e17cbed73f49ca5c0225b6e5bbd302
-size 34580

dos2unix-5.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ac403a207c938e86d9387b82aaf41c27f7e158acbce15a81cddab2cf030c235
+size 62325

dos2unix-cloexec.patch

@@ -0,0 +1,37 @@
+--- dos2unix.c.orig
++++ dos2unix.c
+@@ -158,8 +158,8 @@
+   #define R_CNTRL   "rb"
+   #define W_CNTRL   "wb"
+ #else
+-  #define R_CNTRL   "r"
+-  #define W_CNTRL   "w"
++  #define R_CNTRL   "re"
++  #define W_CNTRL   "we"
+ #endif
+ 
+ #define BINARY_FILE 0x1
+--- unix2dos.c.orig
++++ unix2dos.c
+@@ -148,8 +148,8 @@
+   #define R_CNTRL   "rb"
+   #define W_CNTRL   "wb"
+ #else
+-  #define R_CNTRL   "r"
+-  #define W_CNTRL   "w"
++  #define R_CNTRL   "re"
++  #define W_CNTRL   "we"
+ #endif
+ 
+ #define BINARY_FILE 0x1
+--- Makefile.orig
++++ Makefile
+@@ -198,7 +198,7 @@ endif
+ 
+ CFLAGS	= -O2 -Wall $(RPM_OPT_FLAGS)
+ 
+-EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
++EXTRA_CFLAGS	= -D_GNU_SOURCE -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
+ 		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
+ 		  -DDEBUG=$(DEBUG) \
+ 		  $(CFLAGS_OS)

dos2unix-correct_ending.patch

@@ -1,17 +1,16 @@
-Index: Makefile
+diff -rupN dos2unix-5.3.orig//Makefile dos2unix-5.3//Makefile
-===================================================================
+--- dos2unix-5.3.orig//Makefile	2011-05-21 19:34:56.217828000 +0300
---- Makefile.orig	2011-01-31 22:06:08.000000000 +0100
++++ dos2unix-5.3//Makefile	2011-05-21 19:39:38.670827981 +0300
-+++ Makefile	2011-02-03 18:45:16.548761128 +0100
+@@ -94,7 +94,7 @@ ifdef ENABLE_NLS
-@@ -77,7 +77,7 @@ ifdef ENABLE_NLS
  	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
  endif
  
--DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).htm
+-DOCFILES	= $(PACKAGE).txt $(PACKAGE).htm
-+DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).html
++DOCFILES	= $(PACKAGE).txt $(PACKAGE).html
  INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
  
  #PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
-@@ -249,7 +249,7 @@ $(UNIX2DOS_POT) : unix2dos.c
+@@ -293,7 +293,7 @@ $(UNIX2DOS_POT) : unix2dos.c
  %.pdf: %.ps
  	ps2pdf $< $@
  
@@ -20,3 +19,4 @@ Index: Makefile
  	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
  
  install: all
+Binary files dos2unix-5.3.orig//.Makefile.swp and dos2unix-5.3//.Makefile.swp differ

dos2unix-no_pdf.patch

@@ -1,15 +0,0 @@
-We don't need either ps nor pdf.
-
-Index: Makefile
-===================================================================
---- Makefile.orig	2011-02-15 17:44:49.000000000 +0100
-+++ Makefile	2011-02-15 17:47:59.872343582 +0100
-@@ -77,7 +77,7 @@ ifdef ENABLE_NLS
- 	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
- endif
- 
--DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).html
-+DOCFILES	= $(PACKAGE).txt $(PACKAGE).html
- INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
- 
- #PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)

dos2unix.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat May 21 18:17:55 UTC 2011 - crrodriguez@opensuse.org
+
+- Open all fds with O_CLOEXEC. 
+
+-------------------------------------------------------------------
+Sat May 21 16:59:14 UTC 2011 - vlado.paskov@gmail.com
+
+- Version update to 5.3
+    - removed patch dos2unix-no_pdf.patch, this version doesn't
+      generate pdf/ps documents.
+    - updated dos2unix-correct_ending.patch
+    - fixed Url: in the spec file
+
 -------------------------------------------------------------------
 Tue Feb 15 17:50:05 CET 2011 - pth@suse.de
 

dos2unix.spec

@@ -18,16 +18,15 @@
 
 
 Name:           dos2unix
-BuildRequires:  xz
 Summary:        Text converters to and from DOS/MAC to UNIX
-Version:        5.2
+Version:        5.3
 Release:        1
 Group:          Productivity/Text/Convertors
 License:        BSD3c
 Url:		http://www.xs4all.nl/~waterlan/#DOS2UNIX
-Source:         %{name}-%{version}.tar.xz
+Source:         %{name}-%{version}.tar.gz
 Patch0:         dos2unix-correct_ending.patch
-Patch1:         dos2unix-no_pdf.patch
+Patch1:         dos2unix-cloexec.patch
 Provides:       unix2dos = %{version}
 Obsoletes:      unix2dos < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -41,7 +40,7 @@ format to DOS format and unix2dos converts from UNIX to MAC format.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 %patch1
 find . -type f | xargs chmod -x