From a0567ace5612301f1e38d52c43348c9b813fcc82 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 6 Oct 2019 11:24:04 +0200 Subject: [PATCH] dos2unix: Update from 7.4.0 to 7.4.1 --- packages/dos2unix/Makefile.patch | 8 ++++---- packages/dos2unix/build.sh | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/dos2unix/Makefile.patch b/packages/dos2unix/Makefile.patch index fb7d2359b..f4c84063b 100644 --- a/packages/dos2unix/Makefile.patch +++ b/packages/dos2unix/Makefile.patch @@ -1,6 +1,6 @@ -diff -u -r ../dos2unix-7.4.0/Makefile ./Makefile ---- ../dos2unix-7.4.0/Makefile 2017-10-10 20:00:32.000000000 +0000 -+++ ./Makefile 2018-02-04 22:37:16.843447335 +0000 +diff -u -r ../dos2unix-7.4.1/Makefile ./Makefile +--- ../dos2unix-7.4.1/Makefile 2019-09-24 18:57:34.000000000 +0000 ++++ ./Makefile 2019-10-06 09:21:39.309020574 +0000 @@ -50,7 +50,7 @@ UNIX2MAC = unix2mac @@ -24,7 +24,7 @@ diff -u -r ../dos2unix-7.4.0/Makefile ./Makefile endif -LDFLAGS_USER = --LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) +-LDFLAGS = $(RPM_LD_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) LIBS = $(LIBS_EXTRA) DEFS_USER = diff --git a/packages/dos2unix/build.sh b/packages/dos2unix/build.sh index b6bed1b50..a428fa13e 100644 --- a/packages/dos2unix/build.sh +++ b/packages/dos2unix/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://waterlan.home.xs4all.nl/dos2unix.html TERMUX_PKG_DESCRIPTION="Converts between DOS and Unix text files" TERMUX_PKG_LICENSE="BSD 2-Clause" -TERMUX_PKG_VERSION=7.4.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=7.4.1 TERMUX_PKG_SRCURL=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a +TERMUX_PKG_SHA256=1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libandroid-support"