[Pkg-irc-commits] r301 - in /packages/inspircd2/trunk/debian: changelog control 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
Sun Jul 13 15:56:31 UTC 2014 

Author: kcd-guest
Date: Sun Jul 13 15:56:31 2014
New Revision: 301

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=301
Log:
Compile inspircd with 'D=2 all', add fix for #745948 and drop hardening-wrapper dep (already in debian/rules)

Added:
    packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff
Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/control
    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=301&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog	(original)
+++ packages/inspircd2/trunk/debian/changelog	Sun Jul 13 15:56:31 2014
@@ -1,5 +1,6 @@
 inspircd (2.0.16-1) unstable; urgency=low
 
+  [ Guillaume Delacour ]
   * New upstream release (Closes: #724874), enable m_regex_stdlib new module
     and repack tarball to remove docs/rfc/{rfc1035.txt,rfc1413.txt,rfc1459.txt}
     as i re-introduce them a few years ago. Upstream removes dir at 7fea7c24c5
@@ -17,15 +18,26 @@
     + Build-Depends on dh-systemd (>= 1.5)
     + Add debian/inspircd.service, debian/inspircd.tmpfiles.d.conf
     + debian/rules: call generic dh with "--with systemd"
-  * debian/control: Change Vcs-{Svn,Browser}, point to anonscm.debian.org and
+  * debian/control:
+    + Change Vcs-{Svn,Browser}, point to anonscm.debian.org and
     bump to Standards-Version 3.9.5 (no changes needed)
+    + Drop Build-Depends on hardening-wrapper since dpkg-buildflags now
+    returns hardening build flags by default (already enabled in debian/rules)
   * debian/patches/02_disable_rpath_for_extra_modules.diff: Refresh according
     upstream modules changes
   * debian/copyright: make it machine-readable
   * debian/rules: compile binary with debuginfo as upstream don't
     generate it by default; dh_strip overrided to generate a -dbg package
 
- -- Guillaume Delacour <gui at iroqwa.org>  Sun, 23 Mar 2014 17:03:55 +0100
+  [ Andreas Metzler ]
+  * Build with debug symbols and optimization by using "make D=2 all" instead
+    of "make debug"; dh_strip overrided to generate a -dbg package
+  * 05_gnutls_crypt_api_instead_gcrypt.diff Apply/unfuzz upstream's
+    690c372f6ef246b43b477e3685c8e716431427ad to get rid of the dependency on
+    libgcrypt.
+  * Build against gnutls v3. Closes: #745948
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Sun, 13 Jul 2014 15:13:53 +0200
 
 inspircd (2.0.5-1) unstable; urgency=low
 

Modified: packages/inspircd2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/control?rev=301&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/control	(original)
+++ packages/inspircd2/trunk/debian/control	Sun Jul 13 15:56:31 2014
@@ -9,10 +9,10 @@
   Giacomo Catenazzi <cate at debian.org>,
   Bradley Smith <bradsmith at debian.org>,
   Guillaume Delacour <gui at iroqwa.org>
-Build-Depends: debhelper (>= 9.0.0), perl-modules, libgnutls-dev, pkg-config,
+Build-Depends: debhelper (>= 9.0.0), perl-modules, libgnutls28-dev, pkg-config,
                libldap2-dev, libpcre3-dev, libmysqlclient-dev, libpq-dev,
                libsqlite3-dev, zlib1g-dev, libgeoip-dev,
-               libtre-dev, hardening-wrapper, dh-systemd (>= 1.5)
+               libtre-dev, dh-systemd (>= 1.5)
 Standards-Version: 3.9.5
 Homepage: http://www.inspircd.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-irc/packages/inspircd2/trunk/

Added: packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff?rev=301&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff	(added)
+++ packages/inspircd2/trunk/debian/patches/05_gnutls_crypt_api_instead_gcrypt.diff	Sun Jul 13 15:56:31 2014
@@ -0,0 +1,64 @@
+Description: Use GnuTLS crypto API instead of gcrypt.
+ This is a hand-appliead 690c372f6ef246b43b477e3685c8e716431427ad by Peter
+ Powell from upstream git.
+Bug-Debian: http://bugs.debian.org/745948
+Origin: upstream, https://github.com/inspircd/inspircd/commit/690c372f6ef246b43b477e3685c8e716431427ad
+Forwarded: not-needed
+Last-Update: 2014-07-13
+
+--- a/src/modules/extra/m_ssl_gnutls.cpp
++++ b/src/modules/extra/m_ssl_gnutls.cpp
+@@ -22,12 +22,18 @@
+ 
+ 
+ #include "inspircd.h"
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ #include "ssl.h"
+ #include "m_cap.h"
+ 
++#if (GNUTLS_VERSION_MAJOR > 2 || GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR > 12)
++# define GNUTLS_HAS_RND
++# include <gnutls/crypto.h>
++#else
++# include <gcrypt.h>
++#endif
++
+ #ifdef _WIN32
+ # pragma comment(lib, "libgnutls.lib")
+ # pragma comment(lib, "libgcrypt.lib")
+@@ -40,9 +46,8 @@
+ #endif
+ 
+ /* $ModDesc: Provides SSL support for clients */
+-/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") exec("libgcrypt-config --cflags") */
+-/* $LinkerFlags: pkgconflibs("gnutls","/libgnutls.so","-lgnutls") exec("libgcrypt-config --libs") */
+-/* $NoPedantic */
++/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") -Wno-pedantic */
++/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
+ 
+ #ifndef GNUTLS_VERSION_MAJOR
+ #define GNUTLS_VERSION_MAJOR LIBGNUTLS_VERSION_MAJOR
+@@ -89,7 +94,11 @@ class RandGen : public HandlerBase2<void
+ 	RandGen() {}
+ 	void Call(char* buffer, size_t len)
+ 	{
++#ifdef GNUTLS_HAS_RND
++		gnutls_rnd(GNUTLS_RND_RANDOM, buffer, len);
++#else
+ 		gcry_randomize(buffer, len, GCRY_STRONG_RANDOM);
++#endif
+ 	}
+ };
+ 
+@@ -250,7 +259,9 @@ class ModuleSSLGnuTLS : public Module
+ 	ModuleSSLGnuTLS()
+ 		: starttls(this), capHandler(this, "tls"), iohook(this, "ssl/gnutls", SERVICE_IOHOOK)
+ 	{
++#ifndef GNUTLS_HAS_RND
+ 		gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
++#endif
+ 
+ 		sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
+ 

Modified: packages/inspircd2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/series?rev=301&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/series	(original)
+++ packages/inspircd2/trunk/debian/patches/series	Sun Jul 13 15:56:31 2014
@@ -1 +1,2 @@
 02_disable_rpath_for_extra_modules.diff
+05_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=301&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/rules	(original)
+++ packages/inspircd2/trunk/debian/rules	Sun Jul 13 15:56:31 2014
@@ -32,9 +32,10 @@
 
 # allow parallel build
 override_dh_auto_build:
-	# compile binary with debuginfo (make debug) as upstream don't generate
-	# symbols by default. dh_strip generate a -dbg package (see below)
-	dh_auto_build --parallel -- debug
+	# compile binary with debuginfo and optimization (make D=2 all) as upstream
+	# don't generate symbols by default. dh_strip generate a -dbg package
+	# (see below)
+	dh_auto_build --parallel -- D=2 all
 
 # install
 override_dh_auto_install:

More information about the Pkg-irc-commits mailing list