summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
-rw-r--r--debian/clean2
-rw-r--r--debian/copyright25
-rw-r--r--debian/libmowgli-2-0.symbols46
-rw-r--r--debian/patches/001-Disable_Makefile_silent_output.diff4
-rw-r--r--debian/patches/002-Make-Examples-Buildable-standalone.diff65
-rw-r--r--debian/patches/003-Fix-machine.h.diff24
-rw-r--r--debian/patches/004-No-openssl.diff15
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
10 files changed, 121 insertions, 73 deletions
diff --git a/debian/changelog b/debian/changelog
index 527ed6a..f2309f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libmowgli-2 (2.0.0+git20140224.89982cf4-1) experimental; urgency=medium
+
+ * New upstream snapshot (Closes: #741518).
+ * Refresh patches.
+ * Update symbols file.
+ * Update the home page URL (Closes: #747383).
+ * Add pkg-config dependency (Closes: #747336).
+
+ -- Andrew Shadura <andrewsh@debian.org> Wed, 18 Jun 2014 23:36:06 +0200
+
libmowgli-2 (2.0.0-3) unstable; urgency=medium
* Fix symbols, unbreak build on kFreeBSD.
diff --git a/debian/clean b/debian/clean
index 8c6c9f0..92d8807 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,4 @@
.deps src/.deps src/*/.deps src/*/*/.deps buildsys.mk config.log config.status extra.mk *.pc
src/libmowgli/*/*.dep
src/libmowgli/platform/autoconf.h
-config.sub config.guess
+config.sub config.guess configure config.rpath
diff --git a/debian/copyright b/debian/copyright
index 0f21221..0eb2a30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,29 +5,20 @@ on Wed, 10 Oct 2007 13:15:01 +0200.
It was downloaded from http://www.atheme.org/project/mowgli
-Copyright Holders:
-
- William Pitcock <nenolod@sacredspiral.co.uk>
- Patrick McFarland <pmcfarland@adterrasperaspera.com>
- Jonathan Schleifer <js@h3c.de>
- Pippijn van Steenhoven <pippijn@one09.net>
- Jilles Tjoelker <jilles@stack.nl>
- Giacomo Lozito <james -at- develia.org>
- Takuji Nishimura and Makoto Matsumoto
- Elizabeth Myers <elizabeth -at- sporksmoo.net>
-
-License (for everything except the exceptions listed below):
-
+Copyright:
© 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
- © 2008 Jilles Tjoelker
- © 2007-2008 Jilles Tjoelker
+ © 2007-2008 Jilles Tjoelker <jilles@stack.nl>
© 2005-2006 Theo Julienne <terminal -at- atheme.org>
- © 2007 Jilles Tjoelker <jilles -at- stack.nl>
© 2007 Pippijn van Steenhoven <pippijn -at- one09.net>
© 2007 Giacomo Lozito <james -at- develia.org>
© 1999-2007 Takuji Nishimura and Makoto Matsumoto
- © 2007, Jonathan Schleifer <js-buildsys@webkeks.org>
+ © 2007 Jonathan Schleifer <js-buildsys@webkeks.org>
+ © 2012 Elizabeth Myers <elizabeth -at- sporksmoo.net>
+ © 2011 Andrew Wilcox <awilcox -at- wilcox-tech.com>
+ © 2012-2013 Patrick McFarland <pmcfarland@adterrasperaspera.com>
+ © 2012 Alex Iadicicco <alex -at- ajitek.net>
+License (for everything except the exceptions listed below):
Atheme License (ISC derivate):
Permission to use, copy, modify, and/or distribute this software for any
diff --git a/debian/libmowgli-2-0.symbols b/debian/libmowgli-2-0.symbols
index 4b3c027..74b9754 100644
--- a/debian/libmowgli-2-0.symbols
+++ b/debian/libmowgli-2-0.symbols
@@ -1,11 +1,14 @@
libmowgli-2.so.0 libmowgli-2-0 #MINVER#
(arch=linux-any)_mowgli_epoll_pollops@Base 2.0.0
(arch=kfreebsd-any)_mowgli_kqueue_pollops@Base 2.0.0
+ _mowgli_log_buf@Base 2.0.0+git20140224
+ _mowgli_log_cb@Base 2.0.0+git20140224
_mowgli_null_mutex_ops@Base 2.0.0
_mowgli_null_pollops@Base 2.0.0
_mowgli_poll_pollops@Base 2.0.0
_mowgli_posix_mutex_ops@Base 2.0.0
_mowgli_select_pollops@Base 2.0.0
+ cacheline_size@Base 2.0.0+git20140224
mowgli_alloc@Base 0.7.0
mowgli_alloc_array@Base 0.7.0
mowgli_alloc_array_using_policy@Base 2.0.0
@@ -17,6 +20,7 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_allocator_malloc@Base 0.7.0
mowgli_allocator_set_policy@Base 0.7.0
mowgli_allocator_set_policy_by_name@Base 0.7.0
+ mowgli_argc@Base 2.0.0+git20140224
mowgli_argstack_bootstrap@Base 2.0.0
mowgli_argstack_create@Base 0.7.0
mowgli_argstack_create_from_va_list@Base 0.7.0
@@ -24,6 +28,7 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_argstack_pop_numeric@Base 0.7.0
mowgli_argstack_pop_pointer@Base 0.7.0
mowgli_argstack_pop_string@Base 0.7.0
+ mowgli_argv@Base 2.0.0+git20140224
mowgli_bitvector_bootstrap@Base 2.0.0
mowgli_bitvector_combine@Base 0.7.0
mowgli_bitvector_compare@Base 0.7.0
@@ -31,6 +36,8 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_bitvector_get@Base 0.7.0
mowgli_bitvector_set@Base 0.7.0
mowgli_bitvector_xor@Base 0.7.0
+ mowgli_cacheline_bootstrap@Base 2.0.0+git20140224
+ mowgli_cacheline_size@Base 2.0.0+git20140224
mowgli_config_file_free@Base 2.0.0
mowgli_config_file_load@Base 2.0.0
mowgli_dictionary_add@Base 0.7.0
@@ -66,6 +73,7 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_dns_evloop_init@Base 2.0.0
mowgli_dns_evloop_resolver@Base 2.0.0
mowgli_dns_evloop_restart@Base 2.0.0
+ mowgli_dns_evloop_set_resolvconf@Base 2.0.0+git20140224
mowgli_dns_gethost_byaddr@Base 2.0.0
mowgli_dns_gethost_byname@Base 2.0.0
mowgli_dns_init@Base 2.0.0
@@ -137,10 +145,39 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_index_set@Base 1.0.0
mowgli_index_sort@Base 1.0.0
mowgli_init@Base 0.7.0
+ mowgli_interface_bootstrap@Base 2.0.0+git20140224
+ mowgli_interface_get@Base 2.0.0+git20140224
+ mowgli_interface_register@Base 2.0.0+git20140224
+ mowgli_interface_unregister@Base 2.0.0+git20140224
+ mowgli_json_create_array@Base 2.0.0+git20140224
+ mowgli_json_create_float@Base 2.0.0+git20140224
+ mowgli_json_create_integer@Base 2.0.0+git20140224
+ mowgli_json_create_object@Base 2.0.0+git20140224
+ mowgli_json_create_string@Base 2.0.0+git20140224
+ mowgli_json_create_string_n@Base 2.0.0+git20140224
+ mowgli_json_decref@Base 2.0.0+git20140224
+ mowgli_json_false@Base 2.0.0+git20140224
+ mowgli_json_incref@Base 2.0.0+git20140224
+ mowgli_json_null@Base 2.0.0+git20140224
+ mowgli_json_parse_create@Base 2.0.0+git20140224
+ mowgli_json_parse_data@Base 2.0.0+git20140224
+ mowgli_json_parse_destroy@Base 2.0.0+git20140224
+ mowgli_json_parse_error@Base 2.0.0+git20140224
+ mowgli_json_parse_file@Base 2.0.0+git20140224
+ mowgli_json_parse_more@Base 2.0.0+git20140224
+ mowgli_json_parse_next@Base 2.0.0+git20140224
+ mowgli_json_parse_reset@Base 2.0.0+git20140224
+ mowgli_json_parse_string@Base 2.0.0+git20140224
+ mowgli_json_serialize@Base 2.0.0+git20140224
+ mowgli_json_serialize_to_string@Base 2.0.0+git20140224
+ mowgli_json_true@Base 2.0.0+git20140224
mowgli_linebuf_attach_to_eventloop@Base 2.0.0
mowgli_linebuf_create@Base 2.0.0
+ mowgli_linebuf_delim@Base 2.0.0+git20140224
mowgli_linebuf_destroy@Base 2.0.0
+ mowgli_linebuf_detach_from_eventloop@Base 2.0.0+git20140224
mowgli_linebuf_setbuflen@Base 2.0.0
+ mowgli_linebuf_shut_down@Base 2.0.0+git20140224
mowgli_linebuf_write@Base 2.0.0
mowgli_linebuf_writef@Base 2.0.0
mowgli_list_concat@Base 0.7.0
@@ -148,7 +185,9 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_list_free@Base 0.7.0
mowgli_list_reverse@Base 0.7.0
mowgli_list_sort@Base 0.7.0
+ mowgli_log_bootstrap@Base 2.0.0+git20140224
mowgli_log_cb_default@Base 0.7.0
+ mowgli_log_prefix_real@Base 2.0.0+git20140224
mowgli_log_real@Base 0.7.0
mowgli_log_set_cb@Base 0.7.0
mowgli_memslice_bootstrap@Base 2.0.0
@@ -178,6 +217,7 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_node_move@Base 0.7.0
mowgli_node_nth@Base 0.7.0
mowgli_node_nth_data@Base 0.7.0
+ mowgli_object_class_bootstrap@Base 2.0.0+git20140224
mowgli_object_class_check_cast@Base 0.7.0
mowgli_object_class_destroy@Base 0.7.0
mowgli_object_class_find_by_name@Base 0.7.0
@@ -223,8 +263,10 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_patricia_stats@Base 0.7.0
mowgli_pollable_create@Base 2.0.0
mowgli_pollable_destroy@Base 2.0.0
+ mowgli_pollable_set_cloexec@Base 2.0.0+git20140224
mowgli_pollable_set_nonblocking@Base 2.0.0
mowgli_pollable_setselect@Base 2.0.0
+ mowgli_pollable_trigger@Base 2.0.0+git20140224
mowgli_process_clone@Base 2.0.0
mowgli_process_kill@Base 2.0.0
mowgli_process_spawn@Base 2.0.0
@@ -269,6 +311,8 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_string_reset@Base 0.7.0
mowgli_strlcat@Base 1.0.0
mowgli_strlcpy@Base 1.0.0
+ mowgli_strndup@Base 2.0.0+git20140224
+ mowgli_strndup_using_policy@Base 2.0.0+git20140224
mowgli_timer_add@Base 2.0.0
mowgli_timer_add_once@Base 2.0.0
mowgli_timer_destroy@Base 2.0.0
@@ -279,10 +323,12 @@ libmowgli-2.so.0 libmowgli-2-0 #MINVER#
mowgli_vio_default_close@Base 2.0.0
mowgli_vio_default_connect@Base 2.0.0
mowgli_vio_default_error@Base 2.0.0
+ mowgli_vio_default_evops@Base 2.0.0+git20140224
mowgli_vio_default_listen@Base 2.0.0
mowgli_vio_default_ops@Base 2.0.0
mowgli_vio_default_read@Base 2.0.0
mowgli_vio_default_recvfrom@Base 2.0.0
+ mowgli_vio_default_reuseaddr@Base 2.0.0+git20140224
mowgli_vio_default_seek@Base 2.0.0
mowgli_vio_default_sendto@Base 2.0.0
mowgli_vio_default_socket@Base 2.0.0
diff --git a/debian/patches/001-Disable_Makefile_silent_output.diff b/debian/patches/001-Disable_Makefile_silent_output.diff
index 879d91d..7189358 100644
--- a/debian/patches/001-Disable_Makefile_silent_output.diff
+++ b/debian/patches/001-Disable_Makefile_silent_output.diff
@@ -3,7 +3,7 @@ Description: Let's show what happens...
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
-@@ -101,7 +101,7 @@
+@@ -102,7 +102,7 @@
MO_FILES = ${LOCALES:.po=.mo}
@@ -11,4 +11,4 @@ Description: Let's show what happens...
+#.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
+ .PHONY: all subdirs ${SUBDIRS} pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
diff --git a/debian/patches/002-Make-Examples-Buildable-standalone.diff b/debian/patches/002-Make-Examples-Buildable-standalone.diff
index 7eea37d..180f9b9 100644
--- a/debian/patches/002-Make-Examples-Buildable-standalone.diff
+++ b/debian/patches/002-Make-Examples-Buildable-standalone.diff
@@ -10,8 +10,8 @@ Description: This patch makes the examples build standalone.
-#include <mowgli.h>
+#include <libmowgli-2/mowgli.h>
- int main(int argc, char *argv[])
- {
+ int
+ main(int argc, char *argv[])
--- a/src/examples/formattertest/Makefile
+++ b/src/examples/formattertest/Makefile
@@ -1,7 +1,7 @@
@@ -33,7 +33,7 @@ Description: This patch makes the examples build standalone.
+#include <libmowgli-2/mowgli.h>
#ifdef _WIN32
- #define strcasecmp _stricmp
+ # define strcasecmp _stricmp
--- a/src/examples/listsort/Makefile
+++ b/src/examples/listsort/Makefile
@@ -1,7 +1,7 @@
@@ -45,13 +45,6 @@ Description: This patch makes the examples build standalone.
CPPFLAGS += -I../../libmowgli
LIBS += -L../../libmowgli -lmowgli-2
---- a/src/examples/Makefile
-+++ b/src/examples/Makefile
-@@ -1,3 +1,3 @@
- SUBDIRS = echoserver vio-udplistener async_resolver formattertest helpertest libevent-bench linetest listsort memslice-bench patriciatest patriciatest2 randomtest timertest futuretest
-
--include ../../buildsys.mk
-+include buildsys.mk
--- a/src/examples/randomtest/Makefile
+++ b/src/examples/randomtest/Makefile
@@ -1,7 +1,7 @@
@@ -72,8 +65,8 @@ Description: This patch makes the examples build standalone.
-#include <mowgli.h>
+#include <libmowgli-2/mowgli.h>
- int main(int argc, char *argv[])
- {
+ int
+ main(int argc, char *argv[])
--- a/src/examples/async_resolver/async_resolver.c
+++ b/src/examples/async_resolver/async_resolver.c
@@ -1,6 +1,6 @@
@@ -117,28 +110,6 @@ Description: This patch makes the examples build standalone.
CPPFLAGS += -I../../libmowgli
LIBS += -L../../libmowgli -lmowgli-2
---- a/src/examples/futuretest/futuretest.c
-+++ b/src/examples/futuretest/futuretest.c
-@@ -23,7 +23,7 @@
-
- #include <string.h>
-
--#include <mowgli.h>
-+#include <libmowgli-2/mowgli.h>
-
- int main(int argc, char *argv[]) {
- char *text = "hello world";
---- a/src/examples/futuretest/Makefile
-+++ b/src/examples/futuretest/Makefile
-@@ -1,7 +1,7 @@
- PROG_NOINST = futuretest${PROG_SUFFIX}
- SRCS = futuretest.c
-
--include ../../../buildsys.mk
-+include ../buildsys.mk
-
- CPPFLAGS += -I../../libmowgli
- LIBS += -L../../libmowgli -lmowgli-2
--- a/src/examples/helpertest/helpertest.c
+++ b/src/examples/helpertest/helpertest.c
@@ -21,7 +21,7 @@
@@ -163,15 +134,15 @@ Description: This patch makes the examples build standalone.
LIBS += -L../../libmowgli -lmowgli-2
--- a/src/examples/libevent-bench/bench.c
+++ b/src/examples/libevent-bench/bench.c
-@@ -73,7 +73,7 @@
- } \
+@@ -76,7 +76,7 @@
+ } \
} while (0)
-#include <mowgli.h>
+#include <libmowgli-2/mowgli.h>
-
static int count, writes, fired;
+ static mowgli_eventloop_t *base_eventloop;
--- a/src/examples/libevent-bench/Makefile
+++ b/src/examples/libevent-bench/Makefile
@@ -1,7 +1,7 @@
@@ -218,9 +189,9 @@ Description: This patch makes the examples build standalone.
LIBS += -L../../libmowgli -lmowgli-2
--- a/src/examples/memslice-bench/memslice-bench.c
+++ b/src/examples/memslice-bench/memslice-bench.c
-@@ -28,7 +28,7 @@
- } \
- } while (0)
+@@ -30,7 +30,7 @@
+ } \
+ } while (0)
-#include <mowgli.h>
+#include <libmowgli-2/mowgli.h>
@@ -315,3 +286,17 @@ Description: This patch makes the examples build standalone.
#define BUFSIZE 2048
+--- a/src/examples/Makefile
++++ b/src/examples/Makefile
+@@ -1,2 +1,2 @@
+ SUBDIRS = echoserver vio-udplistener async_resolver formattertest helpertest jsontest libevent-bench linetest listsort memslice-bench patriciatest patriciatest2 randomtest timertest
+-include ../../buildsys.mk
++include buildsys.mk
+--- a/src/examples/jsontest/jsontest.c
++++ b/src/examples/jsontest/jsontest.c
+@@ -1,4 +1,4 @@
+-#include <mowgli.h>
++#include <libmowgli-2/mowgli.h>
+
+ void
+ out_string(mowgli_json_output_t *out, const char *str, size_t len)
diff --git a/debian/patches/003-Fix-machine.h.diff b/debian/patches/003-Fix-machine.h.diff
index a9f8773..1a7d42b 100644
--- a/debian/patches/003-Fix-machine.h.diff
+++ b/debian/patches/003-Fix-machine.h.diff
@@ -1,18 +1,18 @@
--- a/src/libmowgli/platform/machine.h
+++ b/src/libmowgli/platform/machine.h
-@@ -180,13 +180,13 @@
- #if defined _LP64 || defined __LP64
- #define MOWGLI_CPU_BITS 64
- #define MOWGLI_CPU_BITS_64
--#elif
-+#else
- #define MOWGLI_CPU_BITS 32
- #define MOWGLI_CPU_BITS_32
- #endif
+@@ -186,13 +186,13 @@
+ # if defined _LP64 || defined __LP64
+ # define MOWGLI_CPU_BITS 64
+ # define MOWGLI_CPU_BITS_64
+-# elif
++# else
+ # define MOWGLI_CPU_BITS 32
+ # define MOWGLI_CPU_BITS_32
+ # endif
#endif
-#if defined __linux || defined __linux__
+#if defined __linux || defined __linux__ || defined __FreeBSD_kernel__
- #define MOWGLI_OS_LINUX
- #define MOWGLI_OS linux
- #define MOWGLI_OS_THREADS_POSIX
+ # define MOWGLI_OS_LINUX
+ # define MOWGLI_OS linux
+ # define MOWGLI_OS_THREADS_POSIX
diff --git a/debian/patches/004-No-openssl.diff b/debian/patches/004-No-openssl.diff
new file mode 100644
index 0000000..1a8cf7d
--- /dev/null
+++ b/debian/patches/004-No-openssl.diff
@@ -0,0 +1,15 @@
+--- a/m4/ax_check_openssl.m4
++++ b/m4/ax_check_openssl.m4
+@@ -42,9 +42,11 @@
+ [root of the OpenSSL directory])],
+ [
+ case "$withval" in
+- "" | y | ye | yes | n | no)
++ y | ye | yes)
+ AC_MSG_ERROR([Invalid --with-openssl value])
+ ;;
++ "" | n | no) ssldirs=""
++ ;;
+ *) ssldirs="$withval"
+ ;;
+ esac
diff --git a/debian/patches/series b/debian/patches/series
index de1b8cb..7b4be3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
001-Disable_Makefile_silent_output.diff
002-Make-Examples-Buildable-standalone.diff
003-Fix-machine.h.diff
+004-No-openssl.diff
diff --git a/debian/rules b/debian/rules
index 56ea1fe..63b011e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- dh_auto_configure -- SHELL=/bin/sh
+ dh_auto_configure -- SHELL=/bin/sh --with-openssl=no
override_dh_auto_install:
dh_auto_install
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 15:20:01 +0000