[packages/dante] - updated to 1.4.2 - updated build patch - removed obsolete format patch - added cpp patch (fix comp

qboosh qboosh at pld-linux.org
Sun Apr 16 12:15:37 CEST 2017 

commit 23a2dfa710a9042ef619c6f44811020939c54e9b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 16 12:15:48 2017 +0200

    - updated to 1.4.2
    - updated build patch
    - removed obsolete format patch
    - added cpp patch (fix compatibility with recent gcc preprocessors)

 dante-build.patch  | 45 ++++++++++++++++++---------------------------
 dante-cpp.patch    | 45 +++++++++++++++++++++++++++++++++++++++++++++
 dante-format.patch | 20 --------------------
 dante.spec         | 16 +++++++---------
 4 files changed, 70 insertions(+), 56 deletions(-)
---
diff --git a/dante.spec b/dante.spec
index 98eeb13..4cf24bd 100644
--- a/dante.spec
+++ b/dante.spec
@@ -1,5 +1,4 @@
-# TODO:
-# - examine ldap and sasl support (deps are pulled into *.la, no direct linking anywhere?)
+# NOTE: ldap and sasl seems stub in this (free only?) version
 #
 # Conditional build:
 %bcond_without	upnp	# UPnP support (via miniupnp)
@@ -7,22 +6,23 @@
 Summary:	A free Socks v4/v5 client implementation
 Summary(pl.UTF-8):	Darmowa implementacja klienta Socks v4/5
 Name:		dante
-Version:	1.4.1
+Version:	1.4.2
 Release:	1
 License:	BSD-like
 Group:		Networking/Daemons
-Source0:	ftp://ftp.inet.no/pub/socks/%{name}-%{version}.tar.gz
-# Source0-md5:	68c2ce12119e12cea11a90c7a80efa8f
+#Source0Download: http://www.inet.no/dante/download.html
+Source0:	http://www.inet.no/dante/files/%{name}-%{version}.tar.gz
+# Source0-md5:	29c2931339655da51576c4d2b7bf16f3
 Source1:	sockd.init
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-build.patch
-Patch2:		%{name}-format.patch
+Patch2:		%{name}-cpp.patch
 URL:		http://www.inet.no/dante/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	heimdal-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libwrap-devel
 %{?with_upnp:BuildRequires:	miniupnpc-devel >= 1.6}
 BuildRequires:	openldap-devel
@@ -71,10 +71,8 @@ Summary:	Development files for socks library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki socks
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
-Requires:	cyrus-sasl-devel
 Requires:	heimdal-devel
 %{?with_upnp:Requires:	miniupnpc-devel >= 1.6}
-Requires:	openldap-devel
 Requires:	pam-devel
 
 %description devel
diff --git a/dante-build.patch b/dante-build.patch
index 41db72b..db199d3 100644
--- a/dante-build.patch
+++ b/dante-build.patch
@@ -1,32 +1,23 @@
---- 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"
+--- dante-1.4.2/compiler.m4.orig	2017-04-16 09:24:45.152661908 +0200
++++ dante-1.4.2/compiler.m4	2017-04-16 09:27:39.452659919 +0200
+@@ -437,7 +437,6 @@
+     #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"
+ 
+     case $COMPTYPE in
+ 	gcc)
+@@ -447,12 +446,6 @@
+ 		    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'`"
+-		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
+ 	    fi
+ 	    ;;
+     esac
diff --git a/dante-cpp.patch b/dante-cpp.patch
new file mode 100644
index 0000000..e10c22b
--- /dev/null
+++ b/dante-cpp.patch
@@ -0,0 +1,45 @@
+--- dante-1.4.2/acinclude.m4.orig	2017-01-23 20:28:08.000000000 +0100
++++ dante-1.4.2/acinclude.m4	2017-04-16 11:08:02.385924479 +0200
+@@ -1106,6 +1106,8 @@
+ dnl test function that tries to determine if a specified errno error exists
+ m4_define([checkerrno],
+  [AC_MSG_CHECKING(for errno symbol $3)
++  CPPFLAGS_save="$CPPFLAGS"
++  CPPFLAGS="$CPPFLAGS -P"
+   AC_PREPROC_IFELSE(
+        [AC_LANG_PROGRAM([[#include <errno.h>]],
+                         [[
+@@ -1117,7 +1119,9 @@
+        [AC_MSG_RESULT([OK])
+         $1="$$1 $3"
+         cat conftest.i | grep errnoval: >>$2],
+-       [AC_MSG_RESULT([no])])])
++       [AC_MSG_RESULT([no])])
++  CPPFLAGS="$CPPFLAGS_save"
++])
+ AC_DEFUN([L_CHECKERRNO],
+  [checkerrno($@)])
+ 
+@@ -1127,8 +1131,11 @@
+ dnl test function that tries to determine if a specified errno error exists
+ m4_define([checkgaierror],
+  [AC_MSG_CHECKING(for getaddrinfo() error $3)
++  CPPFLAGS_save="$CPPFLAGS"
++  CPPFLAGS="$CPPFLAGS -P"
+   AC_PREPROC_IFELSE(
+        [AC_LANG_PROGRAM([[
++//#define _GNU_SOURCE 1
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>]],
+@@ -1142,7 +1149,9 @@
+         $1="$$1 $3"
+         AC_DEFINE(HAVE_ERR_$3, 1, [$3 gai error found])
+         cat conftest.i | grep gaierrval: >>$2],
+-       [AC_MSG_RESULT([no])])])
++       [AC_MSG_RESULT([no])])
++  CPPFLAGS="$CPPFLAGS_save"
++])
+ AC_DEFUN([L_CHECKGAIERROR],
+  [checkgaierror($@)])
+ 
diff --git a/dante-format.patch b/dante-format.patch
deleted file mode 100644
index b41f744..0000000
--- a/dante-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dante-1.4.1/lib/upnp.c.orig	2014-08-21 18:21:50.000000000 +0200
-+++ dante-1.4.1/lib/upnp.c	2014-10-25 18:12:07.582908742 +0200
-@@ -828,7 +828,7 @@
- {
-    const char *function = "sighandler()";
- 
--   slog(LOG_DEBUG, function);
-+   slog(LOG_DEBUG, "%s", function);
-    upnpcleanup(-1);
- 
-    /* reinstall original signal handler. */
-@@ -936,7 +936,7 @@
- {
-    const char *function = "atexit_upnpcleanup()";
- 
--   slog(LOG_DEBUG, function);
-+   slog(LOG_DEBUG, "%s", function);
-    upnpcleanup(-1);
- }
- #endif /* SOCKS_CLIENT */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dante.git/commitdiff/23a2dfa710a9042ef619c6f44811020939c54e9b

More information about the pld-cvs-commit mailing list