Patches have been merged upstream.

4 files changed, 0 insertions, 116 deletions

diff --git a/debian/patches/configure_libnss.diff b/debian/patches/configure_libnss.diff
deleted file mode 100644
index 9a23c0a..0000000
--- a/debian/patches/configure_libnss.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/gns/nss/Makefile.am
-+++ b/src/gns/nss/Makefile.am
-@@ -21,11 +21,7 @@
- 
- AM_LDFLAGS=-avoid-version -module -export-dynamic
- 
--if HAVE_SUDO
- nssdir = /lib/
--else
--nssdir = $(libdir)
--endif
- 
- LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a8a2656..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-configure_libnss.diff
-support_GNU_hurd.patch
-sparc_alignment.patch
diff --git a/debian/patches/sparc_alignment.patch b/debian/patches/sparc_alignment.patch
deleted file mode 100644
index 8707ad1..0000000
--- a/debian/patches/sparc_alignment.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: grothoff
-Date: 2012-07-30 09:26:05 +0200 (Mon, 30 Jul 2012)
-New Revision: 22960
-
-Modified:
-   gnunet/src/include/gnunet_common.h
-Log:
-fix for gcc alginment issue on sparc reported to Debian as #670578
-
-Modified: gnunet/src/include/gnunet_common.h
-===================================================================
---- a/src/include/gnunet_common.h
-+++ b/src/include/gnunet_common.h
-@@ -170,9 +170,13 @@
-  */
- #define GNUNET_NORETURN __attribute__((noreturn))
- 
-+#if MINGW
- #if __GNUC__ > 3
- /**
-- * gcc 4.x-ism to pack structures even on W32 (to be used before structs)
-+ * gcc 4.x-ism to pack structures even on W32 (to be used before structs);
-+ * Using this would cause structs to be unaligned on the stack on Sparc,
-+ * so we *only* use this on W32 (see #670578 from Debian); fortunately,
-+ * W32 doesn't run on sparc anyway.
-  */
- #define GNUNET_NETWORK_STRUCT_BEGIN \
-   _Pragma("pack(push)") \
-@@ -180,19 +184,23 @@
- 
- /**
-  * gcc 4.x-ism to pack structures even on W32 (to be used after structs)
-+ * Using this would cause structs to be unaligned on the stack on Sparc,
-+ * so we *only* use this on W32 (see #670578 from Debian); fortunately,
-+ * W32 doesn't run on sparc anyway.
-  */
- #define GNUNET_NETWORK_STRUCT_END _Pragma("pack(pop)")
-+
- #else
--#ifdef MINGW
- #error gcc 4.x or higher required on W32 systems
- #endif
-+#else
- /**
-- * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
-+ * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32
-  */
- #define GNUNET_NETWORK_STRUCT_BEGIN 
- 
- /**
-- * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
-+ * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32;
-  */
- #define GNUNET_NETWORK_STRUCT_END
- #endif
diff --git a/debian/patches/support_GNU_hurd.patch b/debian/patches/support_GNU_hurd.patch
deleted file mode 100644
index d48de27..0000000
--- a/debian/patches/support_GNU_hurd.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -162,6 +162,11 @@
-      UNIXONLY=""
-      funcstocheck=""
-      ;;
-+gnu*)
-+     AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system])
-+     build_target="gnu"
-+     UNIXONLY="#"
-+     ;;
- *)
-      AC_MSG_RESULT(Unrecognised OS $host_os)
-      AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
-@@ -184,6 +189,7 @@
- AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd")
- AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd")
- AM_CONDITIONAL(LINUX, test "$build_target" = "linux")
-+AM_CONDITIONAL(GNU, test "$build_target" = "gnu")
- 
- AC_MSG_RESULT([$build_target])
- AC_SUBST(build_target)
---- a/src/include/platform.h
-+++ b/src/include/platform.h
-@@ -146,7 +146,7 @@
- #include <semaphore.h>
- #include <net/if.h>
- #endif
--#ifdef LINUX
-+#if defined(LINUX) || defined(GNU)
- #include <net/if.h>
- #endif
- #ifdef SOLARIS
---- a/src/util/disk.c
-+++ b/src/util/disk.c
-@@ -47,7 +47,7 @@
- 
- 
- 
--#if defined(LINUX) || defined(CYGWIN)
-+#if defined(LINUX) || defined(CYGWIN) || defined(GNU)
- #include <sys/vfs.h>
- #else
- #if defined(SOMEBSD) || defined(DARWIN)