Package: sagan
Version: 1.2.0-1
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an NMU for sagan (versioned as 1.2.0-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards,

 - Jonas

diff -Nru sagan-1.2.0/debian/changelog sagan-1.2.0/debian/changelog
--- sagan-1.2.0/debian/changelog        2018-07-05 14:52:54.000000000 +0200
+++ sagan-1.2.0/debian/changelog        2019-09-10 16:15:15.000000000 +0200
@@ -1,3 +1,14 @@
+sagan (1.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch cherry-picked upstream
+    to remove duplicate rule file in sagan.yaml.
+    Closes: Bug#933239.
+  * Fix postinst script redirection to silence stderr as intended.
+    Closes: Bug#908241. Thanks to Nicolas Jeannerod and Ralf Treinen.
+
+ -- Jonas Smedegaard <d...@jones.dk>  Tue, 10 Sep 2019 16:15:15 +0200
+
 sagan (1.2.0-1) unstable; urgency=medium
 
   * New upstream version 1.2.0
diff -Nru sagan-1.2.0/debian/patches/fix_duplicate_rule_file.patch 
sagan-1.2.0/debian/patches/fix_duplicate_rule_file.patch
--- sagan-1.2.0/debian/patches/fix_duplicate_rule_file.patch    1970-01-01 
01:00:00.000000000 +0100
+++ sagan-1.2.0/debian/patches/fix_duplicate_rule_file.patch    2019-09-10 
16:06:44.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Remove duplicate rule file in sagan.yaml
+Origin: upstream, https://github.com/beave/sagan/commit/52386ed
+Author: Champ Clark III <ch...@dev.quadrantsec.com>
+Bug: https://github.com/beave/sagan/issues/118
+Bug-Debian: https://bugs.debian.org/933239
+Forwarded: yes
+Last-Update: 2019-09-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/sagan.yaml
++++ b/etc/sagan.yaml
+@@ -689,7 +689,6 @@
+   - $RULE_PATH/windows-owa.rules
+   - $RULE_PATH/windows.rules
+   - $RULE_PATH/windows-sysmon.rules
+-  - $RULE_PATH/windows-security.rules
+   - $RULE_PATH/wordpress.rules
+   - $RULE_PATH/xinetd.rules
+   - $RULE_PATH/yubikey.rules
diff -Nru sagan-1.2.0/debian/patches/series sagan-1.2.0/debian/patches/series
--- sagan-1.2.0/debian/patches/series   2018-04-29 15:24:28.000000000 +0200
+++ sagan-1.2.0/debian/patches/series   2019-09-10 15:58:31.000000000 +0200
@@ -0,0 +1 @@
+fix_duplicate_rule_file.patch
diff -Nru sagan-1.2.0/debian/postinst sagan-1.2.0/debian/postinst
--- sagan-1.2.0/debian/postinst 2018-04-29 15:46:11.000000000 +0200
+++ sagan-1.2.0/debian/postinst 2019-09-10 16:10:18.000000000 +0200
@@ -5,7 +5,7 @@
 add_sysuser()
 {
        if ! getent passwd sagan >/dev/null; then
-               adduser --system --disabled-login --no-create-home --home 
/nonexistent --ingroup adm sagan 2>&1 > /dev/null
+               adduser --system --disabled-login --no-create-home --home 
/nonexistent --ingroup adm sagan > /dev/null 2>&1
        fi
 }
 

Reply via email to