Bug#778673: unblock: suricata/2.0.6-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package suricata
We just uploaded to unstable a new suricata version (2.0.6-2) which
would require another unblock to enter jessie.
This is the debdiff, which was generated with (unfiltered):
% debdiff suricata_2.0.6-1.dsc suricata_2.0.6-2.dsc
diff -Nru suricata-2.0.6/debian/changelog suricata-2.0.6/debian/changelog
--- suricata-2.0.6/debian/changelog 2015-02-18 11:42:51.000000000 +0100
+++ suricata-2.0.6/debian/changelog 2015-02-18 11:33:51.000000000 +0100
@@ -1,3 +1,14 @@
+suricata (2.0.6-2) unstable; urgency=medium
+
+ [ Arturo Borrero Gonzalez ]
+ * d/patches: drop 10-fix-missing-script-autoreconf.patch (Closes: #778670)
+ * d/rules: prevent not .so libhtp files from entering binary suricata package
+
+ [ Pierre Chifflier ]
+ * Add conflicts/replaces fields for transition from libhtp (Closes: #778668)
+
+ -- Pierre Chifflier <pollux@debian.org> Wed, 18 Feb 2015 11:19:31 +0100
+
suricata (2.0.6-1) unstable; urgency=medium
[ Pierre Chifflier ]
diff -Nru suricata-2.0.6/debian/control suricata-2.0.6/debian/control
--- suricata-2.0.6/debian/control 2015-02-18 11:42:51.000000000 +0100
+++ suricata-2.0.6/debian/control 2015-02-18 11:33:51.000000000 +0100
@@ -30,6 +30,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends}
+Conflicts: libhtp1 (<< 0.5.16), libhtp-dev (<< 0.5.16)
+Replaces: libhtp1 (<< 0.5.16), libhtp-dev (<< 0.5.16)
Recommends: oinkmaster, snort-rules-default, python
Description: Next Generation Intrusion Detection and Prevention Tool
Suricata is a network Intrusion Detection System (IDS). It is based on
diff -Nru suricata-2.0.6/debian/patches/10-fix-missing-script-autoreconf.patch suricata-2.0.6/debian/patches/10-fix-missing-script-autoreconf.patch
--- suricata-2.0.6/debian/patches/10-fix-missing-script-autoreconf.patch 2015-02-18 11:42:51.000000000 +0100
+++ suricata-2.0.6/debian/patches/10-fix-missing-script-autoreconf.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-Index: suricata/libhtp/configure.ac
-===================================================================
---- suricata.orig/libhtp/configure.ac 2014-04-01 08:25:37.604832456 +0200
-+++ suricata/libhtp/configure.ac 2014-04-02 20:11:01.504628889 +0200
-@@ -3,7 +3,7 @@
- dnl Initialization macros
- dnl ----------------------
-
--AC_INIT([LibHTP], m4_esyscmd([./get-version.sh VERSION]))
-+AC_INIT([LibHTP], 0.5.10)
- AM_INIT_AUTOMAKE()
-
- AC_CONFIG_HEADERS([config.h])
diff -Nru suricata-2.0.6/debian/patches/series suricata-2.0.6/debian/patches/series
--- suricata-2.0.6/debian/patches/series 2015-02-18 11:42:51.000000000 +0100
+++ suricata-2.0.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-10-fix-missing-script-autoreconf.patch
diff -Nru suricata-2.0.6/debian/rules suricata-2.0.6/debian/rules
--- suricata-2.0.6/debian/rules 2015-02-18 11:42:51.000000000 +0100
+++ suricata-2.0.6/debian/rules 2015-02-18 10:57:35.000000000 +0100
@@ -35,7 +35,11 @@
rm -rf $(DEB_DESTDIR)/usr/lib/python*;\
(cd scripts/suricatasc &&\
python -B setup.py install --install-layout=deb --prefix $(DEB_DESTDIR)/usr)
+ # we don't want to deploy any of the libhtp files, only the .so
rm -rf $(CURDIR)/debian/suricata/usr/lib/*/*.la
+ rm -rf $(CURDIR)/debian/suricata/usr/lib/*/*.a
+ rm -rf $(CURDIR)/debian/suricata/usr/lib/*/pkgconfig
+ rm -rf $(CURDIR)/debian/suricata/usr/include
override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_ARGS)
unblock suricata/2.0.6-2
Reply to: