Hi,
I uploaded a NMU to 15-day/delay queue. Feel free to cancel this
upload if needed.
The debian/changelog is:
sagan (1.0.1-0.1) unstable; urgency=low
* Non-maintainer upload.
* New upstream release. (Closes: #753171, #772685)
* debian/control:
- added to Build-Depends:
- libee-dev
- dh-autoreconf
- Bumped Standards-Version to 3.9.6.
* debian/rules:
- disable dbgsym generation.
- rm duplicated sagan binary. (Closes: #681794) Thanks Micah Anderson.
- using '--with autoreconf'. (Closes: #744504) Thanks Matthias Klose.
- '--enable-bluedot'.
* debian/patches:
- 01-do-not-include-lognorm-private-header.patch removed.
Not needed anymore.
- no-bluedot.patch added.
I attached a diff of debian dir
regards,
--
Herbert Parentes Fortes Neto (hpfn)
diff -Naur sagan-0.2.1.r1/debian/changelog sagan-1.0.1/debian/changelog
--- sagan-0.2.1.r1/debian/changelog 2015-12-30 10:13:46.129906257 -0200
+++ sagan-1.0.1/debian/changelog 2015-12-30 10:13:46.825906261 -0200
@@ -1,3 +1,24 @@
+sagan (1.0.1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release. (Closes: #753171, #772685)
+ * debian/control:
+ - added to Build-Depends:
+ - libee-dev
+ - dh-autoreconf
+ - Bumped Standards-Version to 3.9.6.
+ * debian/rules:
+ - disable dbgsym generation.
+ - rm duplicated sagan binary. (Closes: #681794) Thanks Micah Anderson.
+ - using '--with autoreconf'. (Closes: #744504) Thanks Matthias Klose.
+ - '--enable-bluedot'.
+ * debian/patches:
+ - 01-do-not-include-lognorm-private-header.patch removed.
+ Not needed anymore.
+ - no-bluedot.patch added.
+
+ -- Herbert Parentes Fortes Neto <[email protected]> Tue, 29 Dec 2015 11:46:39
-0200
+
sagan (0.2.1.r1-1) unstable; urgency=low
* Imported Upstream version 0.2.1-r1
diff -Naur sagan-0.2.1.r1/debian/control sagan-1.0.1/debian/control
--- sagan-0.2.1.r1/debian/control 2015-12-30 10:13:46.129906257 -0200
+++ sagan-1.0.1/debian/control 2015-12-30 10:13:46.825906261 -0200
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Pierre Chifflier <[email protected]>
Build-Depends: debhelper (>= 9),
- autotools-dev,
+ dh-autoreconf,
pkg-config,
libpcre3-dev,
libesmtp-dev,
@@ -11,8 +11,9 @@
libmysqlclient-dev,
libpq-dev,
libprelude-dev,
- liblognorm-dev
-Standards-Version: 3.9.3
+ liblognorm-dev,
+ libee-dev
+Standards-Version: 3.9.6
Homepage: http://sagan.softwink.com/
#Vcs-Git: git://git.debian.org/collab-maint/sagan.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/sagan.git;a=summary
diff -Naur
sagan-0.2.1.r1/debian/patches/01-do-not-include-lognorm-private-header.patch
sagan-1.0.1/debian/patches/01-do-not-include-lognorm-private-header.patch
---
sagan-0.2.1.r1/debian/patches/01-do-not-include-lognorm-private-header.patch
2015-12-30 10:13:46.129906257 -0200
+++ sagan-1.0.1/debian/patches/01-do-not-include-lognorm-private-header.patch
1969-12-31 21:00:00.000000000 -0300
@@ -1,36 +0,0 @@
-Index: sagan/src/sagan-config.c
-===================================================================
---- sagan.orig/src/sagan-config.c 2012-04-16 22:06:28.942723611 +0200
-+++ sagan/src/sagan-config.c 2012-04-16 22:07:56.226723930 +0200
-@@ -48,7 +48,6 @@
- #ifdef HAVE_LIBLOGNORM
- #include <liblognorm.h>
- #include <ptree.h>
--#include <lognorm.h>
- #endif
-
- #include "version.h"
-Index: sagan/src/sagan-signal.c
-===================================================================
---- sagan.orig/src/sagan-signal.c 2012-04-16 22:06:28.942723611 +0200
-+++ sagan/src/sagan-signal.c 2012-04-16 22:07:56.230723926 +0200
-@@ -41,7 +41,6 @@
- #ifdef HAVE_LIBLOGNORM
- #include <liblognorm.h>
- #include <ptree.h>
--#include <lognorm.h>
- static ln_ctx ctx;
- int liblognorm_count;
- #endif
-Index: sagan/src/sagan.c
-===================================================================
---- sagan.orig/src/sagan.c 2012-04-16 22:06:28.942723611 +0200
-+++ sagan/src/sagan.c 2012-04-16 22:07:56.230723926 +0200
-@@ -58,7 +58,6 @@
- #ifdef HAVE_LIBLOGNORM
- #include <liblognorm.h>
- #include <ptree.h>
--#include <lognorm.h>
- #endif
-
- #ifdef HAVE_LIBDNET
diff -Naur sagan-0.2.1.r1/debian/patches/no-bluedot.patch
sagan-1.0.1/debian/patches/no-bluedot.patch
--- sagan-0.2.1.r1/debian/patches/no-bluedot.patch 1969-12-31
21:00:00.000000000 -0300
+++ sagan-1.0.1/debian/patches/no-bluedot.patch 2015-12-30 10:13:46.825906261
-0200
@@ -0,0 +1,42 @@
+Description: bluedot not enable.
+Author: Herbert Parentes Fortes Neto
+Last-Update: 2015-12-23
+Index: sagan-1.0.1/etc/sagan.conf
+===================================================================
+--- sagan-1.0.1.orig/etc/sagan.conf
++++ sagan-1.0.1/etc/sagan.conf
+@@ -551,7 +551,7 @@ include $RULE_PATH/attack.rules
+ include $RULE_PATH/bash.rules
+ include $RULE_PATH/bind.rules
+ include $RULE_PATH/blacklist.rules
+-include $RULE_PATH/bluedot.rules
++#include $RULE_PATH/bluedot.rules
+ include $RULE_PATH/bonding.rules
+ include $RULE_PATH/bro-ids.rules
+ include $RULE_PATH/bro-intel.rules
+@@ -567,7 +567,7 @@ include $RULE_PATH/cisco-prime.rules
+ include $RULE_PATH/cisco-sdee.rules
+ include $RULE_PATH/cisco-wlc.rules
+ include $RULE_PATH/citrix-blacklist.rules
+-include $RULE_PATH/citrix-bluedot.rules
++#include $RULE_PATH/citrix-bluedot.rules
+ include $RULE_PATH/citrix-brointel.rules
+ include $RULE_PATH/citrix.rules
+ include $RULE_PATH/courier.rules
+@@ -637,14 +637,14 @@ include $RULE_PATH/weblabrinth.rules
+ include $RULE_PATH/windows-applocker.rules
+ include $RULE_PATH/windows-auth.rules
+ include $RULE_PATH/windows-blacklist.rules
+-include $RULE_PATH/windows-bluedot.rules
++#include $RULE_PATH/windows-bluedot.rules
+ include $RULE_PATH/windows-brointel.rules
+ include $RULE_PATH/windows-emet.rules
+ include $RULE_PATH/windows-malware.rules
+ include $RULE_PATH/windows-misc.rules
+ include $RULE_PATH/windows-mssql.rules
+ include $RULE_PATH/windows-owa-blacklist.rules
+-include $RULE_PATH/windows-owa-bluedot.rules
++#include $RULE_PATH/windows-owa-bluedot.rules
+ include $RULE_PATH/windows-owa-brointel.rules
+ include $RULE_PATH/windows-owa.rules
+ include $RULE_PATH/windows.rules
diff -Naur sagan-0.2.1.r1/debian/patches/series
sagan-1.0.1/debian/patches/series
--- sagan-0.2.1.r1/debian/patches/series 2015-12-30 10:13:46.129906257
-0200
+++ sagan-1.0.1/debian/patches/series 2015-12-30 10:13:46.825906261 -0200
@@ -1 +1 @@
-01-do-not-include-lognorm-private-header.patch
+no-bluedot.patch
diff -Naur sagan-0.2.1.r1/debian/rules sagan-1.0.1/debian/rules
--- sagan-0.2.1.r1/debian/rules 2015-12-30 10:13:46.125906257 -0200
+++ sagan-1.0.1/debian/rules 2015-12-30 10:13:46.825906261 -0200
@@ -12,6 +12,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# No dbgsym generation.
+export DEB_BUILD_OPTIONS=noddebs
+
override_dh_auto_configure:
dh_testdir
dh_auto_configure -- --with-postgresql-includes=/usr/include/postgresql
--disable-libdnet LIBS="-lm -lestr -lee"
@@ -19,6 +22,7 @@
override_dh_auto_install:
dh_auto_install
rm -rf debian/sagan/var/run/sagan
+ rm -fr debian/sagan/usr/bin
sed -i \
-e 's|/usr/local/etc|/etc|' \
-e 's|/var/run/sagan.fifo|/var/run/sagan/sagan.fifo|' \
@@ -30,4 +34,4 @@
debian/sagan/etc/sagan.conf
%:
- dh $@
+ dh $@ --with autoreconf
