[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#689154: marked as done (unblock: gnunet/0.9.3-3wheezy1)

Your message dated Fri, 18 Jan 2013 22:50:06 +0100
with message-id <20130118215006.GK5676@radis.cristau.org>
and subject line Re: Bug#689154: unblock: gnunet/0.9.3-5
has caused the Debian Bug report #689154,
regarding unblock: gnunet/0.9.3-3wheezy1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
689154: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689154
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

Dear release team,
I prepared a new revision of GNUnet fixing a few bugs (including 4 serious bugs) with the following changes (the diff is attached): 

  * Revert the use dh_installdocs --link-doc (Closes: #687875, #687881,
    #687883).
  * Fix build on kfreebsd, thanks to Christoph Egger (Closes: #688486).
* Remove special nssdir and hopefully fix FTBFS on ia64 (Closes: #688590). * Change default option UNIX_MATCH_UID as suggested by Daniel Dehennin, patch picked from upstream (Closes: #686238). * Update libgcrypt version check to a less strict check, patch picked from upstream, following Werner Koch's advice (Closes: #684997). * gnunet-server.postinst: check the existence of a binary before changing its permissions (Closes: #688484). 

Would you consider to give gnunet 0.9.3-4 a freeze exception ?

This version is not yet uploaded to unstable, my sponsor is waiting for
your approval.

Cheers,
Bertrand

unblock gnunet/0.9.3-4


diff -Nru gnunet-0.9.3/debian/changelog gnunet-0.9.3/debian/changelog
--- gnunet-0.9.3/debian/changelog	2012-08-26 16:18:16.000000000 +0200
+++ gnunet-0.9.3/debian/changelog	2012-09-29 15:48:23.000000000 +0200
@@ -1,3 +1,18 @@
+gnunet (0.9.3-4) unstable; urgency=low
+
+  * Revert the use dh_installdocs --link-doc (Closes: #687875, #687881,
+    #687883).
+  * Fix build on kfreebsd, thanks to Christoph Egger (Closes: #688486).
+  * Remove special nssdir and hopefully fix FTBFS on ia64 (Closes: #688590).
+  * Change default option UNIX_MATCH_UID as suggested by Daniel Dehennin,
+    patch picked from upstream (Closes: #686238).
+  * Update libgcrypt version check to a less strict check, patch picked from
+    upstream, following Werner Koch's advice (Closes: #684997).
+  * gnunet-server.postinst: check the existence of a binary before changing its
+    permissions (Closes: #688484).
+
+ -- Bertrand Marc <beberking@gmail.com>  Sat, 29 Sep 2012 15:45:53 +0200
+
 gnunet (0.9.3-3) unstable; urgency=low
 
   * debian/control: update Vcs-* to the new repository in collab-maint.
diff -Nru gnunet-0.9.3/debian/gnunet-client.docs gnunet-0.9.3/debian/gnunet-client.docs
--- gnunet-0.9.3/debian/gnunet-client.docs	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-client.docs	2012-09-27 22:30:34.000000000 +0200
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet-dev.docs gnunet-0.9.3/debian/gnunet-dev.docs
--- gnunet-0.9.3/debian/gnunet-dev.docs	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-dev.docs	2012-09-27 22:30:34.000000000 +0200
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet.docs gnunet-0.9.3/debian/gnunet.docs
--- gnunet-0.9.3/debian/gnunet.docs	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet.docs	2012-09-27 22:30:34.000000000 +0200
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru gnunet-0.9.3/debian/gnunet-server.docs gnunet-0.9.3/debian/gnunet-server.docs
--- gnunet-0.9.3/debian/gnunet-server.docs	2012-05-05 14:37:00.000000000 +0200
+++ gnunet-0.9.3/debian/gnunet-server.docs	2012-09-27 22:30:34.000000000 +0200
@@ -1,2 +1,4 @@
+AUTHORS
+README
 doc/README.mysql
 doc/README.postgres
diff -Nru gnunet-0.9.3/debian/gnunet-server.install.kfreebsd gnunet-0.9.3/debian/gnunet-server.install.kfreebsd
--- gnunet-0.9.3/debian/gnunet-server.install.kfreebsd	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/gnunet-server.install.kfreebsd	2012-09-29 08:13:17.000000000 +0200
@@ -0,0 +1,52 @@
+etc/gnunet.conf
+usr/bin/gnunet-arm
+usr/bin/gnunet-core
+usr/bin/gnunet-daemon-*
+usr/bin/gnunet-dht-*
+usr/bin/gnunet-fs
+usr/bin/gnunet-gns*
+usr/bin/gnunet-helper-*
+usr/bin/gnunet-namestore
+usr/bin/gnunet-nat-server
+usr/bin/gnunet-peerinfo
+usr/bin/gnunet-resolver
+usr/bin/gnunet-rsa
+usr/bin/gnunet-service-*
+usr/bin/gnunet-testing
+usr/bin/gnunet-transport
+usr/bin/gnunet-transport-certificate-creation
+usr/bin/mockup-service
+usr/lib/libgnunetarm.so.*
+usr/lib/libgnunetats.so.*
+usr/lib/libgnunetblock.so.*
+usr/lib/libgnunetcore.so.*
+usr/lib/libgnunetdatacache.so.*
+usr/lib/libgnunetdht.so.*
+usr/lib/libgnunetfragmentation.so.*
+usr/lib/libgnunethello.so.*
+usr/lib/libgnunetlockmanager.so.0*
+usr/lib/libgnunetmesh.so.*
+usr/lib/libgnunetnamestore.so.*
+usr/lib/libgnunetnat.so.*
+usr/lib/libgnunetnse.so.*
+usr/lib/libgnunetpeerinfo.so.*
+usr/lib/libgnunettesting.so.*
+usr/lib/libgnunettesting_new.so.0*
+usr/lib/libgnunettestbed.so.0*
+usr/lib/libgnunettransport.so.*
+usr/lib/libgnunettransporttesting.so.*
+usr/lib/libgnunettun.so.*
+usr/lib/gnunet/*.so
+usr/share/gnunet/config.d
+usr/share/gnunet/hellos/*
+usr/share/man/man1/gnunet-arm.1
+usr/share/man/man1/gnunet-core.1
+usr/share/man/man1/gnunet-fs.1
+usr/share/man/man1/gnunet-gns.1
+usr/share/man/man1/gnunet-namestore.1
+usr/share/man/man1/gnunet-nat-server.1
+usr/share/man/man1/gnunet-peerinfo.1
+usr/share/man/man1/gnunet-rsa.1
+usr/share/man/man1/gnunet-transport.1
+usr/share/man/man1/gnunet-vpn.1
+debian/man/* usr/share/man/man1/
diff -Nru gnunet-0.9.3/debian/gnunet-server.postinst gnunet-0.9.3/debian/gnunet-server.postinst
--- gnunet-0.9.3/debian/gnunet-server.postinst	2012-07-07 15:50:27.000000000 +0200
+++ gnunet-0.9.3/debian/gnunet-server.postinst	2012-09-29 15:35:16.000000000 +0200
@@ -86,18 +86,20 @@
 			/usr/bin/gnunet-helper-vpn
 		do
 			# only do something when no setting exists
-			if ! dpkg-statoverride --list $file >/dev/null 2>&1
+			if ! dpkg-statoverride --list $file >/dev/null 2>&1 && [ -e $file ]
 			then
 				chown root:${_GROUPNAME} $file
 				chmod 4754 $file
 			fi
 		done
-		if ! dpkg-statoverride --list /usr/bin/gnunet-helper-dns >/dev/null 2>&1
+		if ! dpkg-statoverride --list /usr/bin/gnunet-helper-dns >/dev/null 2>&1 \
+			&& [ -e /usr/bin/gnunet-helper-dns ]
 		then
 			chown root:${GNUNETDNS_GROUP} /usr/bin/gnunet-helper-dns
 			chmod 4754 /usr/bin/gnunet-helper-dns
 		fi
-		if ! dpkg-statoverride --list /usr/bin/gnunet-service-dns >/dev/null 2>&1
+		if ! dpkg-statoverride --list /usr/bin/gnunet-service-dns >/dev/null 2>&1 \
+			&& [ -e /usr/bin/gnunet-service-dns ]
 		then
 			chown ${_USERNAME}:${GNUNETDNS_GROUP} /usr/bin/gnunet-service-dns
 			chmod 2754 /usr/bin/gnunet-service-dns
diff -Nru gnunet-0.9.3/debian/patches/fix_kfreebsd_build.diff gnunet-0.9.3/debian/patches/fix_kfreebsd_build.diff
--- gnunet-0.9.3/debian/patches/fix_kfreebsd_build.diff	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/patches/fix_kfreebsd_build.diff	2012-09-29 11:34:25.000000000 +0200
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,7 +91,7 @@
+      UNIXONLY="#"
+      AC_PATH_XTRA
+      ;;
+-freebsd*)
++*freebsd*)
+      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+      AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
+      CFLAGS="-D_THREAD_SAFE $CFLAGS"
+@@ -100,7 +100,7 @@
+      DLLDIR=lib
+      UNIXONLY="#"
+      ;;
+-openbsd*)
++*openbsd*)
+      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+      AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
+      LIBS=`echo $LIBS | sed -e "s/-ldl//"`
+@@ -109,7 +109,7 @@
+      DLLDIR=lib
+      UNIXONLY="#"
+      ;;
+-netbsd*)
++*netbsd*)
+      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
+      LIBPREFIX=
diff -Nru gnunet-0.9.3/debian/patches/fix_nss_libdir.diff gnunet-0.9.3/debian/patches/fix_nss_libdir.diff
--- gnunet-0.9.3/debian/patches/fix_nss_libdir.diff	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/patches/fix_nss_libdir.diff	2012-09-29 14:25:40.000000000 +0200
@@ -0,0 +1,32 @@
+--- a/src/gns/nss/Makefile.am
++++ b/src/gns/nss/Makefile.am
+@@ -21,16 +21,10 @@
+ 
+ AM_LDFLAGS=-avoid-version -module -export-dynamic
+ 
+-if HAVE_SUDO
+-nssdir = /lib/
+-else
+-nssdir = $(libdir)
+-endif
+-
+ LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
+ 
+ if !MINGW
+-nss_LTLIBRARIES = \
++lib_LTLIBRARIES = \
+ 	libnss_gns.la \
+ 	libnss_gns4.la \
+ 	libnss_gns6.la
+@@ -52,8 +46,8 @@
+ libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
+ 
+ install-data-hook:
+-	$(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(nssdir)
+-	$(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.la $(nssdir)/libnss_gns4.la $(nssdir)/libnss_gns6.la 
++	$(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool --finish $(libdir)
++	$(SUDO_BINARY) rm -f $(libdir)/libnss_gns.la $(libdir)/libnss_gns4.la $(libdir)/libnss_gns6.la
+ 
+ uninstall-hook:
+-	$(SUDO_BINARY) rm -f $(nssdir)/libnss_gns.so.2 $(nssdir)/libnss_gns4.so.2 $(nssdir)/libnss_gns6.so.2 
++	$(SUDO_BINARY) rm -f $(libdir)/libnss_gns.so.2 $(libdir)/libnss_gns4.so.2 $(libdir)/libnss_gns6.so.2
diff -Nru gnunet-0.9.3/debian/patches/libgcrypt_version_check.diff gnunet-0.9.3/debian/patches/libgcrypt_version_check.diff
--- gnunet-0.9.3/debian/patches/libgcrypt_version_check.diff	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/patches/libgcrypt_version_check.diff	2012-09-29 15:15:55.000000000 +0200
@@ -0,0 +1,47 @@
+--- a/src/util/crypto_random.c
++++ b/src/util/crypto_random.c
+@@ -302,12 +302,12 @@
+ void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
+ {
+   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
+-  if (!gcry_check_version (GCRYPT_VERSION))
++  if (!gcry_check_version (NEED_LIBGCRYPT_VERSION))
+   {
+     FPRINTF (stderr,
+              _
+              ("libgcrypt has not the expected version (version %s is required).\n"),
+-             GCRYPT_VERSION);
++             NEED_LIBGCRYPT_VERSION);
+     GNUNET_abort ();
+   }
+ #ifdef GCRYCTL_INITIALIZATION_FINISHED
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,13 +211,25 @@
+ 
+ # libgcrypt
+ gcrypt=0
+-AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
++NEED_LIBGCRYPT_API=1
++NEED_LIBGCRYPT_VERSION=1.4.2
++
++
++AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
+ AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
+ 
+ if test $gcrypt = 0
+ then
+-  AC_MSG_ERROR([GNUnet needs libgcrypt])
++  AC_MSG_ERROR([[
++***
++*** You need libgcrypt to build this program.
++**  This library is for example available at
++***   ftp://ftp.gnupg.org/gcrypt/libgcrypt/
++*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API)
++***  is required.)
++***]])
+ fi
++AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version])
+ 
+ # Adam shostack suggests the following for Windows:
+ # -D_FORTIFY_SOURCE=2 -fstack-protector-all
diff -Nru gnunet-0.9.3/debian/patches/series gnunet-0.9.3/debian/patches/series
--- gnunet-0.9.3/debian/patches/series	2012-08-01 21:46:33.000000000 +0200
+++ gnunet-0.9.3/debian/patches/series	2012-09-29 15:13:35.000000000 +0200
@@ -1,2 +1,6 @@
+libgcrypt_version_check.diff
+unix_match_uid.diff
+fix_nss_libdir.diff
+fix_kfreebsd_build.diff
 support_GNU_hurd.patch
 sparc_alignment.patch
diff -Nru gnunet-0.9.3/debian/patches/unix_match_uid.diff gnunet-0.9.3/debian/patches/unix_match_uid.diff
--- gnunet-0.9.3/debian/patches/unix_match_uid.diff	1970-01-01 01:00:00.000000000 +0100
+++ gnunet-0.9.3/debian/patches/unix_match_uid.diff	2012-09-29 14:59:19.000000000 +0200
@@ -0,0 +1,13 @@
+Index: src/datastore/datastore.conf.in
+===================================================================
+--- a/src/datastore/datastore.conf.in
++++ b/src/datastore/datastore.conf.in
+@@ -1,7 +1,7 @@
+ [datastore]
+ AUTOSTART = YES
+ UNIXPATH = /tmp/gnunet-service-datastore.sock
+-UNIX_MATCH_UID = YES
++UNIX_MATCH_UID = NO
+ UNIX_MATCH_GID = YES
+ @UNIXONLY@ PORT = 2093
+ HOSTNAME = localhost
diff -Nru gnunet-0.9.3/debian/rules gnunet-0.9.3/debian/rules
--- gnunet-0.9.3/debian/rules	2012-06-19 20:07:36.000000000 +0200
+++ gnunet-0.9.3/debian/rules	2012-09-27 22:30:34.000000000 +0200
@@ -35,9 +35,6 @@
 override_dh_install:
 	dh_install -a --fail-missing
 
-override_dh_installdocs:
-	dh_installdocs --link-doc=gnunet-common
-
 override_dh_strip:
 	dh_strip --dbg-package=gnunet-dbg

--- End Message ---
--- Begin Message --- 
On Fri, Jan 18, 2013 at 18:47:22 +0100, Holger Levsen wrote:

> Hi Bertrand,
> 
> On Sonntag, 13. Januar 2013, Bertrand Marc wrote:
> > 
> http://mentors.debian.net/debian/pool/main/g/gnunet/gnunet_0.9.3-5.dsc
> 
> uploaded to sid.
> 
and unblocked.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: