[Pkg-irc-commits] r305 - in /packages/inspircd2/trunk/debian: changelog patches/02_disable_rpath_for_extra_modules.diff patches/03_gnutls_crypt_api_instead_gcrypt.diff patches/05_gnutls_crypt_api_instead_gcrypt.diff patches/series rules

kcd-guest at users.alioth.debian.org kcd-guest at users.alioth.debian.org
Wed Sep 24 20:57:00 UTC 2014 

Author: kcd-guest
Date: Wed Sep 24 20:57:00 2014
New Revision: 305

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=305
Log:
New upstream release 2.0.17, refresh gnutls_crypt_api_instead_gcrypt patch and disable_rpath

Added:
    packages/inspircd2/trunk/debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff
Removed:
    packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff
Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff
    packages/inspircd2/trunk/debian/patches/series
    packages/inspircd2/trunk/debian/rules

Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=305&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog	(original)
+++ packages/inspircd2/trunk/debian/changelog	Wed Sep 24 20:57:00 2014
@@ -1,3 +1,14 @@
+inspircd (2.0.17-1) unstable; urgency=medium
+
+  * New upstream release
+  * Refresh debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff and
+    cherry-pick upstream fix to use gnutls_rnd instead of gcry_randomize
+  * Refresh debian/patches/02_disable_rpath_for_extra_modules.diff
+   to only patch m_mysql as upstream use a DISABLE_RPATH environnement
+   variable that disable rpath in all other modules
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Fri, 05 Sep 2014 18:05:19 +0200
+
 inspircd (2.0.16-2) unstable; urgency=medium
 
   * To re-enable hardening flags:

Modified: packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff?rev=305&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff	(original)
+++ packages/inspircd2/trunk/debian/patches/02_disable_rpath_for_extra_modules.diff	Wed Sep 24 20:57:00 2014
@@ -1,11 +1,13 @@
 From: Guillaume Delacour <gui at iroqwa.org>
 Subject: Disable rpath build option in modules
-Last-Update: 2013-12-18
+Last-Update: 2014-09-24
 Forwarded: not-needed
 
---- a/src/modules/extra/m_mysql.cpp
-+++ b/src/modules/extra/m_mysql.cpp
-@@ -37,7 +37,7 @@
+Index: inspircd-2.0.17/src/modules/extra/m_mysql.cpp
+===================================================================
+--- inspircd-2.0.17.orig/src/modules/extra/m_mysql.cpp
++++ inspircd-2.0.17/src/modules/extra/m_mysql.cpp
+@@ -35,7 +35,7 @@
  
  /* $ModDesc: SQL Service Provider module for all other m_sql* modules */
  /* $CompileFlags: exec("mysql_config --include") */
@@ -14,47 +16,3 @@
  
  /* THE NONBLOCKING MYSQL API!
   *
---- a/src/modules/extra/m_regex_pcre.cpp
-+++ b/src/modules/extra/m_regex_pcre.cpp
-@@ -25,7 +25,7 @@
- /* $ModDesc: Regex Provider Module for PCRE */
- /* $ModDep: m_regex.h */
- /* $CompileFlags: exec("pcre-config --cflags") */
--/* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
-+/* $LinkerFlags: exec("pcre-config --libs") */
- 
- #ifdef _WIN32
- # pragma comment(lib, "libpcre.lib")
---- a/src/modules/extra/m_regex_tre.cpp
-+++ b/src/modules/extra/m_regex_tre.cpp
-@@ -25,7 +25,7 @@
- 
- /* $ModDesc: Regex Provider Module for TRE Regular Expressions */
- /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
--/* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
-+/* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") */
- /* $ModDep: m_regex.h */
- 
- class TRERegexException : public ModuleException
---- a/src/modules/extra/m_ssl_gnutls.cpp
-+++ b/src/modules/extra/m_ssl_gnutls.cpp
-@@ -41,7 +41,7 @@
- 
- /* $ModDesc: Provides SSL support for clients */
- /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") exec("libgcrypt-config --cflags") */
--/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
-+/* $LinkerFlags: pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
- /* $NoPedantic */
- 
- #ifndef GNUTLS_VERSION_MAJOR
---- a/src/modules/extra/m_ssl_openssl.cpp
-+++ b/src/modules/extra/m_ssl_openssl.cpp
-@@ -51,7 +51,7 @@
- 
- /* $LinkerFlags: if("USE_FREEBSD_BASE_SSL") -lssl -lcrypto */
- /* $CompileFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
--/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
-+/* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
- 
- /* $NoPedantic */
- 

Added: packages/inspircd2/trunk/debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff?rev=305&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff	(added)
+++ packages/inspircd2/trunk/debian/patches/03_gnutls_crypt_api_instead_gcrypt.diff	Wed Sep 24 20:57:00 2014
@@ -0,0 +1,66 @@
+From: Peter Powell <petpow at saberuk.com>
+Subject: [PATCH] Use gnutls_rnd instead of gcry_randomize on newer GnuTLS
+ versions.
+Origin: upstream, https://github.com/inspircd/inspircd/issues/905
+Bug-Debian: http://bugs.debian.org/745948
+
+This is a modified version of 690c372.
+---
+ make/utilities.pm                  | 9 +++++++++
+ src/modules/extra/m_ssl_gnutls.cpp | 9 +++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/make/utilities.pm b/make/utilities.pm
+index 42dd6b5..ae16ce3 100644
+--- a/make/utilities.pm
++++ b/make/utilities.pm
+@@ -319,6 +319,15 @@ sub translate_functions($$)
+ 			die "Developers should no longer use backticks in configuration macros. Please use exec() and eval() macros instead. Offending line: $line (In module: $module)";
+ 		}
+ 
++		if ($line =~ /if(gt|lt)\("(.+?)","(.+?)"\)/) {
++			chomp(my $result = `$2 2>/dev/null`);
++			if (($1 eq 'gt' && $result le $3) || ($1 eq 'lt' && $result ge $3)) {
++				$line = substr $line, 0, $-[0];
++			} else {
++				$line =~ s/if$1\("$2","$3"\)//;
++			}
++		}
++
+ 		if ($line =~ /ifuname\(\!"(\w+)"\)/)
+ 		{
+ 			my $uname = $1;
+diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
+index 6a6a792..1779937 100644
+--- a/src/modules/extra/m_ssl_gnutls.cpp
++++ b/src/modules/extra/m_ssl_gnutls.cpp
+@@ -22,9 +22,6 @@
+ 
+ 
+ #include "inspircd.h"
+-#ifndef _WIN32
+-#include <gcrypt.h>
+-#endif
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ #include "ssl.h"
+@@ -35,8 +32,8 @@
+ #endif
+ 
+ /* $ModDesc: Provides SSL support for clients */
+-/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") exec("libgcrypt-config --cflags") */
+-/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
++/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") iflt("pkg-config --modversion gnutls","2.12") exec("libgcrypt-config --cflags") */
++/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") iflt("pkg-config --modversion gnutls","2.12") exec("libgcrypt-config --libs") */
+ /* $NoPedantic */
+ 
+ #ifndef GNUTLS_VERSION_MAJOR
+@@ -55,7 +52,7 @@ typedef gnutls_certificate_credentials_t gnutls_certificate_credentials;
+ typedef gnutls_dh_params_t gnutls_dh_params;
+ #endif
+ 
+-#if (defined(_WIN32) && (GNUTLS_VERSION_MAJOR > 2 || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR >= 12)))
++#if (GNUTLS_VERSION_MAJOR > 2 || (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR >= 12))
+ # define GNUTLS_HAS_RND
+ # include <gnutls/crypto.h>
+ #else

Modified: packages/inspircd2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/series?rev=305&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/series	(original)
+++ packages/inspircd2/trunk/debian/patches/series	Wed Sep 24 20:57:00 2014
@@ -1,3 +1,3 @@
+02_disable_rpath_for_extra_modules.diff
 01_dpkg-buildflags_support.diff
-02_disable_rpath_for_extra_modules.diff
-05_gnutls_crypt_api_instead_gcrypt.diff
+03_gnutls_crypt_api_instead_gcrypt.diff

Modified: packages/inspircd2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/rules?rev=305&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/rules	(original)
+++ packages/inspircd2/trunk/debian/rules	Wed Sep 24 20:57:00 2014
@@ -21,7 +21,7 @@
 
 override_dh_auto_configure:
 	# Enable extra modules
-	./configure --enable-extras=$(INSPIRCD_MODULES)
+	DISABLE_RPATH=yes ./configure --enable-extras=$(INSPIRCD_MODULES)
 
 	# Really launch configure
 	./configure --disable-interactive \

More information about the Pkg-irc-commits mailing list