diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/gnunet-server.install.kfreebsd | 52 | ||||
| -rw-r--r-- | debian/gnunet-server.postinst | 9 | ||||
| -rw-r--r-- | debian/patches/configure_libnss.diff | 61 | ||||
| -rw-r--r-- | debian/patches/default_config_datastore.diff | 13 | ||||
| -rw-r--r-- | debian/patches/default_config_namestore.diff | 11 | ||||
| -rw-r--r-- | debian/patches/fix_kfreebsd_build.diff | 29 | ||||
| -rw-r--r-- | debian/patches/libgcrypt_version_check.diff | 47 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
11 files changed, 20 insertions, 223 deletions
diff --git a/debian/changelog b/debian/changelog index db22fc8..f7ac245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gnunet (0.9.3-5) unstable; urgency=low + + * Revert previous changes to target wheezy: + + depend on gettext. + + drop patch to fix build on kfreebsd. + + drop patch to change default option UNIX_MATCH_UID. + + drop patch about libgcrypt version check. + + -- Bertrand Marc <beberking@gmail.com> Sun, 13 Jan 2013 18:00:29 +0100 + gnunet (0.9.3-4) unstable; urgency=low [ Bertrand Marc ] diff --git a/debian/control b/debian/control index 28af79d..e14b710 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Package: gnunet-client Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: - ${misc:Depends}, ${shlibs:Depends}, gnunet-common (= ${binary:Version}) + ${misc:Depends}, ${shlibs:Depends}, gnunet-common (= ${binary:Version}), + gettext Suggests: gnunet-server, libextractor-plugins Description: secure, trust-based peer-to-peer framework (client) GNUnet is a peer-to-peer framework which focuses on providing security. All @@ -74,7 +75,7 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, gnunet-common (= ${binary:Version}), - adduser, netbase + adduser, gettext, netbase Suggests: miniupnpc Breaks: gnunet-fuse (<<0.9), gnunet-client (<<0.9) Replaces: gnunet-fuse (<<0.9), gnunet-client (<<0.9) diff --git a/debian/gnunet-server.install.kfreebsd b/debian/gnunet-server.install.kfreebsd deleted file mode 100644 index 71c146a..0000000 --- a/debian/gnunet-server.install.kfreebsd +++ /dev/null @@ -1,52 +0,0 @@ -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 --git a/debian/gnunet-server.postinst b/debian/gnunet-server.postinst index cc97f29..76fb9a8 100644 --- a/debian/gnunet-server.postinst +++ b/debian/gnunet-server.postinst @@ -79,26 +79,25 @@ case "${1}" in chmod 0700 "${SERVICEHOME}" || true # Restrict access on setuid binaries for file in /usr/bin/gnunet-helper-exit \ + /usr/bin/gnunet-helper-fs-publish \ /usr/bin/gnunet-helper-nat-client \ /usr/bin/gnunet-helper-nat-server \ /usr/bin/gnunet-helper-transport-wlan \ /usr/bin/gnunet-helper-vpn do # only do something when no setting exists - if ! dpkg-statoverride --list $file >/dev/null 2>&1 && [ -e $file ] + if ! dpkg-statoverride --list $file >/dev/null 2>&1 then chown root:${_GROUPNAME} $file chmod 4754 $file fi done - if ! dpkg-statoverride --list /usr/bin/gnunet-helper-dns >/dev/null 2>&1 \ - && [ -e /usr/bin/gnunet-helper-dns ] + if ! dpkg-statoverride --list /usr/bin/gnunet-helper-dns >/dev/null 2>&1 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 \ - && [ -e /usr/bin/gnunet-service-dns ] + if ! dpkg-statoverride --list /usr/bin/gnunet-service-dns >/dev/null 2>&1 then chown ${_USERNAME}:${GNUNETDNS_GROUP} /usr/bin/gnunet-service-dns chmod 2754 /usr/bin/gnunet-service-dns diff --git a/debian/patches/configure_libnss.diff b/debian/patches/configure_libnss.diff index 89abf75..9a23c0a 100644 --- a/debian/patches/configure_libnss.diff +++ b/debian/patches/configure_libnss.diff @@ -1,71 +1,14 @@ --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am -@@ -21,20 +21,18 @@ +@@ -21,11 +21,7 @@ AM_LDFLAGS=-avoid-version -module -export-dynamic -if HAVE_SUDO --nssdir = /lib/ + nssdir = /lib/ -else -nssdir = $(libdir) -endif -+nssdir = $(NSS_DIR) LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool - if !MINGW -+if INSTALL_NSS - nss_LTLIBRARIES = \ - libnss_gns.la \ - libnss_gns4.la \ - libnss_gns6.la - endif -+endif - - sources = nss_gns_query.h nss_gns_query.c - ---- a/configure.ac -+++ b/configure.ac -@@ -780,6 +780,42 @@ - AC_SUBST(SUDO_BINARY) - AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) - -+ -+# test for nssdir -+AC_MSG_CHECKING(with nssdir) -+AC_ARG_WITH(nssdir, -+ [ --with-nssdir=PATH where to install NSS plugins], -+ [AC_MSG_RESULT("$with_nssdir") -+ case $with_nssdir in -+ no) -+ NSS_DIR= -+ install_nss=0 -+ ;; -+ yes) -+ NSS_DIR="/lib" -+ install_nss=1 -+ ;; -+ *) -+ NSS_DIR=$with_nssdir -+ install_nss=1 -+ ;; -+ esac -+ ], -+ [ -+ if test "x$SUDO_BINARY" != "x" -o -w / -+ then -+ NSS_DIR="/lib" -+ install_nss=1 -+ AC_MSG_RESULT([yes, to /lib]) -+ else -+ NSS_DIR= -+ install_nss=0 -+ AC_MSG_RESULT([no]) -+ fi -+ ]) -+AC_SUBST(NSS_DIR) -+AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"]) -+ - # test for gnunetdns group name - GNUNETDNS_GROUP=gnunetdns - AC_MSG_CHECKING(for gnunetdns group name) diff --git a/debian/patches/default_config_datastore.diff b/debian/patches/default_config_datastore.diff deleted file mode 100644 index dcbca23..0000000 --- a/debian/patches/default_config_datastore.diff +++ /dev/null @@ -1,13 +0,0 @@ -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 --git a/debian/patches/default_config_namestore.diff b/debian/patches/default_config_namestore.diff deleted file mode 100644 index eea0643..0000000 --- a/debian/patches/default_config_namestore.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/namestore/namestore.conf.in -+++ b/src/namestore/namestore.conf.in -@@ -1,7 +1,7 @@ - [namestore] - AUTOSTART = YES - UNIXPATH = /tmp/gnunet-service-namestore.sock --UNIX_MATCH_UID = YES -+UNIX_MATCH_UID = NO - UNIX_MATCH_GID = YES - @UNIXONLY@ PORT = 2099 - HOSTNAME = localhost diff --git a/debian/patches/fix_kfreebsd_build.diff b/debian/patches/fix_kfreebsd_build.diff deleted file mode 100644 index 0a655a5..0000000 --- a/debian/patches/fix_kfreebsd_build.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 --git a/debian/patches/libgcrypt_version_check.diff b/debian/patches/libgcrypt_version_check.diff deleted file mode 100644 index 71c4b84..0000000 --- a/debian/patches/libgcrypt_version_check.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 --git a/debian/patches/series b/debian/patches/series index ec3fd89..a8a2656 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,3 @@ -default_config_namestore.diff configure_libnss.diff -libgcrypt_version_check.diff -default_config_datastore.diff -fix_kfreebsd_build.diff support_GNU_hurd.patch sparc_alignment.patch diff --git a/debian/rules b/debian/rules index b7e42b1..0f9e2eb 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ SHELL := sh -e dh ${@} --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --disable-rpath --enable-guile --enable-ipv6 --with-microhttpd=yes --with-nssdir=yes $(shell dpkg-buildflags --export=configure) + dh_auto_configure -- --disable-rpath --enable-guile --enable-ipv6 --with-microhttpd=yes $(shell dpkg-buildflags --export=configure) override_dh_auto_test: # Disabling test suite, incomplete |