[packages/dante] - up to 1.4.1

arekm arekm at pld-linux.org
Fri Oct 24 22:20:25 CEST 2014


commit 199d5ce332ed81512d07ddd470cfcd28ac095350
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Oct 24 22:20:19 2014 +0200

    - up to 1.4.1

 dante-build.patch | 32 ++++++++++++++++++++++++++++++++
 dante-link.patch  | 15 ---------------
 dante.spec        |  9 ++++-----
 3 files changed, 36 insertions(+), 20 deletions(-)
---
diff --git a/dante.spec b/dante.spec
index c4d002d..1fffd8a 100644
--- a/dante.spec
+++ b/dante.spec
@@ -7,15 +7,15 @@
 Summary:	A free Socks v4/v5 client implementation
 Summary(pl.UTF-8):	Darmowa implementacja klienta Socks v4/5
 Name:		dante
-Version:	1.3.2
-Release:	2
+Version:	1.4.1
+Release:	1
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	ftp://ftp.inet.no/pub/socks/%{name}-%{version}.tar.gz
-# Source0-md5:	250c6456cd3fefa17f07fa80c9ccf6bd
+# Source0-md5:	68c2ce12119e12cea11a90c7a80efa8f
 Source1:	sockd.init
 Patch0:		%{name}-am.patch
-Patch1:		%{name}-link.patch
+Patch1:		%{name}-build.patch
 Patch2:		%{name}-miniupnp.patch
 URL:		http://www.inet.no/dante/
 BuildRequires:	autoconf >= 2.61
@@ -100,7 +100,6 @@ Statyczna biblioteka socks.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/dante-build.patch b/dante-build.patch
new file mode 100644
index 0000000..41db72b
--- /dev/null
+++ b/dante-build.patch
@@ -0,0 +1,32 @@
+--- dante-1.4.1/compiler.m4~	2014-08-02 22:05:19.000000000 +0200
++++ dante-1.4.1/compiler.m4	2014-10-24 22:16:03.014015699 +0200
+@@ -368,29 +368,6 @@
+ 	esac
+     fi
+     CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=1"
+-else
+-    #autoconf_compflags is set to "-g -O2" with GCC
+-    #override CFLAGS when running configure to avoid this
+-    CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=0"
+-    CFLAGS="$CFLAGS${CFLAGS:+ }$autoconf_compflags"
+-
+-    case $COMPTYPE in
+-	gcc)
+-	    if test x"$aixldbug" != x; then
+-	        #disable debug info
+-		if echo $CFLAGS | grep -- "-g" >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`"
+-		fi
+-		CFLAGS="$CFLAGS${CFLAGS:+ }-g0"
+-	    else
+-		#use -ggdb also when not debugging
+-		if echo $CFLAGS | grep -- "-g" >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`"
+-		fi
+-		CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb"
+-	    fi
+-	    ;;
+-    esac
+ fi
+ 
+ #check whether to compilation warnings
diff --git a/dante-link.patch b/dante-link.patch
deleted file mode 100644
index f1af069..0000000
--- a/dante-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- dante-1.3.2/configure.ac.orig	2013-02-04 21:35:07.271902241 +0100
-+++ dante-1.3.2/configure.ac	2013-02-05 15:23:11.200566535 +0100
-@@ -878,12 +878,6 @@
- dnl normal library testing doesn't work for libwrap (doesn't link
- dnl without allow/deny_severity)
- if test "x${ac_cv_header_tcpd_h}" = "xyes"; then
--    case $host in
--	*-*-linux-*)
--	    #XXX needed on atleast redhat
--	    AC_SEARCH_LIBS(yp_get_default_domain, nsl)
--	;;
--    esac
-     oLIBS=$LIBS
-     AC_MSG_CHECKING([for libwrap])
-     if test x$no_libwrap = xt; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dante.git/commitdiff/199d5ce332ed81512d07ddd470cfcd28ac095350



More information about the pld-cvs-commit mailing list