Skip to content

Instantly share code, notes, and snippets.

@mfournier
Created November 25, 2014 13:25
Show Gist options
  • Select an option

  • Save mfournier/fd1cb897199bf18cb772 to your computer and use it in GitHub Desktop.

Select an option

Save mfournier/fd1cb897199bf18cb772 to your computer and use it in GitHub Desktop.
packaging collectd master for debian
diff --git a/debian/control b/debian/control
index 5aec6a6..86471a0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,17 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
+ libatasmart-dev,
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
libesmtp-dev,
libganglia1-dev (>= 3) [linux-any],
libgcrypt11-dev,
libglib2.0-dev,
+ libhiredis-dev,
+ libi2c-dev,
libkvm-dev [kfreebsd-any],
+ libldap2-dev,
liblvm2-dev [linux-any],
libmemcached-dev,
libmodbus-dev,
@@ -27,17 +31,19 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
libperl-dev,
libpq-dev,
libprotobuf-c-dev,
+ librdkafka-dev,
librabbitmq-dev,
librrd-dev (>= 1.4~),
libsensors4-dev [linux-any],
-# libsigrok-dev (>= 0.2~),
+ libsigrok-dev (>= 0.2~),
# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
libtokyocabinet-dev [linux-any],
libtokyotyrant-dev [linux-any],
+ libudev-dev,
libupsclient-dev | libupsclient1-dev,
-# libvarnishapi-dev,
+ libvarnishapi-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
libxml2-dev,
libyajl-dev,
diff --git a/debian/patches/00list b/debian/patches/00list
index f9939c6..8b13789 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,14 +1 @@
-rrd_filter_path.dpatch
-collection_conf_path.dpatch
-collection.cgi.dpatch
-myplugin_includes.dpatch
-myplugin_api.dpatch
-bts559801_plugin_find_fix.dpatch
-bts770681_riemann_ack.dpatch
-bts747093_lvm_segfault.dpatch
-bts770683_curl_init.dpatch
-bts750440_config_segfault.dpatch
-bts770688_snmp_memleak.dpatch
-bts770690_java_jni_thread_detach.dpatch
-bts770693_timestamps.dpatch
-bts770694_loglevel.dpatch
+
diff --git a/debian/patches/bts559801_plugin_find_fix.dpatch b/debian/patches/bts559801_plugin_find_fix.dpatch
deleted file mode 100755
index a48f8c1..0000000
diff --git a/debian/patches/bts747093_lvm_segfault.dpatch b/debian/patches/bts747093_lvm_segfault.dpatch
deleted file mode 100755
index 63ff71a..0000000
diff --git a/debian/patches/bts750440_config_segfault.dpatch b/debian/patches/bts750440_config_segfault.dpatch
deleted file mode 100755
index ff1d07a..0000000
diff --git a/debian/patches/bts770681_riemann_ack.dpatch b/debian/patches/bts770681_riemann_ack.dpatch
deleted file mode 100755
index 7475259..0000000
diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch
deleted file mode 100755
index 8529bf4..0000000
diff --git a/debian/patches/bts770688_snmp_memleak.dpatch b/debian/patches/bts770688_snmp_memleak.dpatch
deleted file mode 100755
index b64e105..0000000
diff --git a/debian/patches/bts770690_java_jni_thread_detach.dpatch b/debian/patches/bts770690_java_jni_thread_detach.dpatch
deleted file mode 100755
index 67a9c77..0000000
diff --git a/debian/patches/bts770693_timestamps.dpatch b/debian/patches/bts770693_timestamps.dpatch
deleted file mode 100755
index bdb537c..0000000
diff --git a/debian/patches/bts770694_loglevel.dpatch b/debian/patches/bts770694_loglevel.dpatch
deleted file mode 100755
index 9a69591..0000000
diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
deleted file mode 100755
index 5156449..0000000
diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch
deleted file mode 100755
index f4ca8e9..0000000
diff --git a/debian/patches/myplugin_api.dpatch b/debian/patches/myplugin_api.dpatch
deleted file mode 100755
index fa2b513..0000000
diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
deleted file mode 100755
index 2b252cf..0000000
diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch
deleted file mode 100755
index 4580bba..0000000
diff --git a/debian/rules b/debian/rules
index b0dd9fd..e6b28bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
+ --enable-debug \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
@@ -83,28 +84,15 @@ confflags += --disable-netapp
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
-# libcredis is required for the *redis plugins.
-confflags += --disable-redis --disable-write_redis
-
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
-# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
-confflags += --disable-sigrok
-
-# varnish does not currently work with varnish4
-# (c.f. https://bugs.debian.org/745902)
-confflags += --disable-varnish
-
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
-# libkstat is required for the xfs_arc plugin.
-confflags += --disable-zfs-arc
-
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
diff --git a/debian/control b/debian/control
index 5aec6a6..117eb2a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,37 +7,36 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
+ libatasmart-dev,
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
libesmtp-dev,
libganglia1-dev (>= 3) [linux-any],
libgcrypt11-dev,
libglib2.0-dev,
+ libhal-dev,
+ libi2c-dev,
libkvm-dev [kfreebsd-any],
- liblvm2-dev [linux-any],
+ libldap2-dev,
libmemcached-dev,
- libmodbus-dev,
- libmnl-dev [linux-any],
libmysqlclient-dev,
libnotify-dev,
libopenipmi-dev,
liboping-dev (>= 0.3.3),
- libow-dev,
libpcap0.8-dev | libpcap-dev,
libperl-dev,
libpq-dev,
- libprotobuf-c-dev,
- librabbitmq-dev,
+ libprotobuf-c0-dev,
librrd-dev (>= 1.4~),
libsensors4-dev [linux-any],
-# libsigrok-dev (>= 0.2~),
# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
libtokyocabinet-dev [linux-any],
libtokyotyrant-dev [linux-any],
+ libudev-dev,
libupsclient-dev | libupsclient1-dev,
-# libvarnishapi-dev,
+ libvarnish-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
libxml2-dev,
libyajl-dev,
@@ -45,7 +44,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
protobuf-c-compiler,
python-dev
-Build-Conflicts: libpthread-dev, libhal-dev
+Build-Conflicts: libpthread-dev
Standards-Version: 3.9.5
Homepage: http://collectd.org/
Vcs-Git: git://git.tokkee.org/pkg-collectd.git
diff --git a/debian/patches/00list b/debian/patches/00list
index f9939c6..8b13789 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,14 +1 @@
-rrd_filter_path.dpatch
-collection_conf_path.dpatch
-collection.cgi.dpatch
-myplugin_includes.dpatch
-myplugin_api.dpatch
-bts559801_plugin_find_fix.dpatch
-bts770681_riemann_ack.dpatch
-bts747093_lvm_segfault.dpatch
-bts770683_curl_init.dpatch
-bts750440_config_segfault.dpatch
-bts770688_snmp_memleak.dpatch
-bts770690_java_jni_thread_detach.dpatch
-bts770693_timestamps.dpatch
-bts770694_loglevel.dpatch
+
diff --git a/debian/patches/bts559801_plugin_find_fix.dpatch b/debian/patches/bts559801_plugin_find_fix.dpatch
deleted file mode 100755
index a48f8c1..0000000
diff --git a/debian/patches/bts747093_lvm_segfault.dpatch b/debian/patches/bts747093_lvm_segfault.dpatch
deleted file mode 100755
index 63ff71a..0000000
diff --git a/debian/patches/bts750440_config_segfault.dpatch b/debian/patches/bts750440_config_segfault.dpatch
deleted file mode 100755
index ff1d07a..0000000
diff --git a/debian/patches/bts770681_riemann_ack.dpatch b/debian/patches/bts770681_riemann_ack.dpatch
deleted file mode 100755
index 7475259..0000000
diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch
deleted file mode 100755
index b1f1c42..0000000
diff --git a/debian/patches/bts770688_snmp_memleak.dpatch b/debian/patches/bts770688_snmp_memleak.dpatch
deleted file mode 100755
index b64e105..0000000
diff --git a/debian/patches/bts770690_java_jni_thread_detach.dpatch b/debian/patches/bts770690_java_jni_thread_detach.dpatch
deleted file mode 100755
index 67a9c77..0000000
diff --git a/debian/patches/bts770693_timestamps.dpatch b/debian/patches/bts770693_timestamps.dpatch
deleted file mode 100755
index bdb537c..0000000
diff --git a/debian/patches/bts770694_loglevel.dpatch b/debian/patches/bts770694_loglevel.dpatch
deleted file mode 100755
index 9a69591..0000000
diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
deleted file mode 100755
index 5156449..0000000
diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch
deleted file mode 100755
index f4ca8e9..0000000
diff --git a/debian/patches/myplugin_api.dpatch b/debian/patches/myplugin_api.dpatch
deleted file mode 100755
index fa2b513..0000000
diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
deleted file mode 100755
index 2b252cf..0000000
diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch
deleted file mode 100755
index 4580bba..0000000
diff --git a/debian/rules b/debian/rules
index b0dd9fd..b1f5643 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
+ --enable-debug \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
@@ -83,27 +84,30 @@ confflags += --disable-netapp
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
-# libcredis is required for the *redis plugins.
-confflags += --disable-redis --disable-write_redis
-
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
confflags += --disable-sigrok
-# varnish does not currently work with varnish4
-# (c.f. https://bugs.debian.org/745902)
-confflags += --disable-varnish
-
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
+# librdkafka is required for the write_kafka plugin.
+confflags += --disable-write_kafka
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
-# libkstat is required for the xfs_arc plugin.
-confflags += --disable-zfs-arc
+# build-deps for these plugins are not available on Squeeze
+confflags += \
+ --disable-amqp \
+ --disable-lvm \
+ --disable-modbus \
+ --disable-netlink \
+ --disable-onewire \
+ --disable-redis \
+ --disable-write_redis \
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
diff --git a/debian/control b/debian/control
index 5aec6a6..de73eff 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,18 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
+ libatasmart-dev,
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
libesmtp-dev,
libganglia1-dev (>= 3) [linux-any],
libgcrypt11-dev,
libglib2.0-dev,
+ libhal-dev,
+ libhiredis-dev,
+ libi2c-dev,
libkvm-dev [kfreebsd-any],
+ libldap2-dev,
liblvm2-dev [linux-any],
libmemcached-dev,
libmodbus-dev,
@@ -26,18 +31,18 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
libpcap0.8-dev | libpcap-dev,
libperl-dev,
libpq-dev,
- libprotobuf-c-dev,
+ libprotobuf-c0-dev,
librabbitmq-dev,
librrd-dev (>= 1.4~),
libsensors4-dev [linux-any],
-# libsigrok-dev (>= 0.2~),
# libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~))
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev,
libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~),
libtokyocabinet-dev [linux-any],
libtokyotyrant-dev [linux-any],
+ libudev-dev,
libupsclient-dev | libupsclient1-dev,
-# libvarnishapi-dev,
+ libvarnishapi-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
libxml2-dev,
libyajl-dev,
@@ -45,7 +50,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
protobuf-c-compiler,
python-dev
-Build-Conflicts: libpthread-dev, libhal-dev
+Build-Conflicts: libpthread-dev
Standards-Version: 3.9.5
Homepage: http://collectd.org/
Vcs-Git: git://git.tokkee.org/pkg-collectd.git
diff --git a/debian/patches/00list b/debian/patches/00list
index f9939c6..8b13789 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,14 +1 @@
-rrd_filter_path.dpatch
-collection_conf_path.dpatch
-collection.cgi.dpatch
-myplugin_includes.dpatch
-myplugin_api.dpatch
-bts559801_plugin_find_fix.dpatch
-bts770681_riemann_ack.dpatch
-bts747093_lvm_segfault.dpatch
-bts770683_curl_init.dpatch
-bts750440_config_segfault.dpatch
-bts770688_snmp_memleak.dpatch
-bts770690_java_jni_thread_detach.dpatch
-bts770693_timestamps.dpatch
-bts770694_loglevel.dpatch
+
diff --git a/debian/patches/bts559801_plugin_find_fix.dpatch b/debian/patches/bts559801_plugin_find_fix.dpatch
deleted file mode 100755
index a48f8c1..0000000
diff --git a/debian/patches/bts747093_lvm_segfault.dpatch b/debian/patches/bts747093_lvm_segfault.dpatch
deleted file mode 100755
index 63ff71a..0000000
diff --git a/debian/patches/bts750440_config_segfault.dpatch b/debian/patches/bts750440_config_segfault.dpatch
deleted file mode 100755
index ff1d07a..0000000
diff --git a/debian/patches/bts770681_riemann_ack.dpatch b/debian/patches/bts770681_riemann_ack.dpatch
deleted file mode 100755
index 7475259..0000000
diff --git a/debian/patches/bts770683_curl_init.dpatch b/debian/patches/bts770683_curl_init.dpatch
deleted file mode 100755
index b1f1c42..0000000
diff --git a/debian/patches/bts770688_snmp_memleak.dpatch b/debian/patches/bts770688_snmp_memleak.dpatch
deleted file mode 100755
index b64e105..0000000
diff --git a/debian/patches/bts770690_java_jni_thread_detach.dpatch b/debian/patches/bts770690_java_jni_thread_detach.dpatch
deleted file mode 100755
index 67a9c77..0000000
diff --git a/debian/patches/bts770693_timestamps.dpatch b/debian/patches/bts770693_timestamps.dpatch
deleted file mode 100755
index bdb537c..0000000
diff --git a/debian/patches/bts770694_loglevel.dpatch b/debian/patches/bts770694_loglevel.dpatch
deleted file mode 100755
index 9a69591..0000000
diff --git a/debian/patches/collection.cgi.dpatch b/debian/patches/collection.cgi.dpatch
deleted file mode 100755
index 5156449..0000000
diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch
deleted file mode 100755
index f4ca8e9..0000000
diff --git a/debian/patches/myplugin_api.dpatch b/debian/patches/myplugin_api.dpatch
deleted file mode 100755
index fa2b513..0000000
diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
deleted file mode 100755
index 2b252cf..0000000
diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch
deleted file mode 100755
index 4580bba..0000000
diff --git a/debian/rules b/debian/rules
index b0dd9fd..b3c57c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
+ --enable-debug \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
@@ -83,28 +84,21 @@ confflags += --disable-netapp
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
-# libcredis is required for the *redis plugins.
-confflags += --disable-redis --disable-write_redis
-
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
confflags += --disable-sigrok
-# varnish does not currently work with varnish4
-# (c.f. https://bugs.debian.org/745902)
-confflags += --disable-varnish
-
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
+# librdkafka is required for the write_kafka plugin.
+confflags += --disable-write_kafka
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
-# libkstat is required for the xfs_arc plugin.
-confflags += --disable-zfs-arc
-
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment