[Forensics-changes] [forensics-all] 01/01: Import Debian version 1.7

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon Dec 11 18:53:29 UTC 2017 

This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository forensics-all.

commit a981c1109a3fe4a1bf2c8828d01071b1f480ad6b
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Wed Dec 6 16:49:41 2017 -0200

    Import Debian version 1.7
    
    forensics-all (1.7) unstable; urgency=medium
    
      * gen-control.sh (source code changes):
          - Added new variables to:
              ~ Declare the Standards Version.
              ~ Declare suggested packages.
              ~ Declare recommended packages.
              ~ Set logical or for packages (e.g. foo|bar).
          - Updated the upstream copyright years.
      * gen-control.sh (configuration changes):
          - Bumped Standards-Version to 4.1.2.
          - Moved grr-client-templates-installer and grr-server to Suggests field.
            Thanks to Axel Beckert <abe at debian.org>. (Closes: #867860)
          - Moved outguess to Recommends field. (see: #882538)
          - Re-added md5deep to EXCLUDE field because hashdeep source still
            providing it.
      * LICENSE: updated the copyright years.
      * templates/control.part1:
          - Changed Standards-Version field to be written by gen-control.sh.
          - Removed no longer needed Suggests field. The gen-control.sh script will
            provide it.
      * debian/copyright: updated the copyright years.
---
 LICENSE                 |   4 +-
 debian/changelog        |  25 +++++++++
 debian/control          |  31 +++++++-----
 debian/copyright        |   2 +-
 gen-control.sh          | 132 +++++++++++++++++++++++++++++++++++++++++-------
 templates/control.part1 |   3 +-
 6 files changed, 161 insertions(+), 36 deletions(-)

diff --git a/LICENSE b/LICENSE
index 9fe2948..b76bf68 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-Copyright 2015-2016 Giovani Augusto Ferreira <giovani at riseup.net>
-Copyright 2015-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
+Copyright 2015-2017 Giovani Augusto Ferreira <giovani at riseup.net>
+Copyright 2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/debian/changelog b/debian/changelog
index 310920a..0886005 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+forensics-all (1.7) unstable; urgency=medium
+
+  * gen-control.sh (source code changes):
+      - Added new variables to:
+          ~ Declare the Standards Version.
+          ~ Declare suggested packages.
+          ~ Declare recommended packages.
+          ~ Set logical or for packages (e.g. foo|bar).
+      - Updated the upstream copyright years.
+  * gen-control.sh (configuration changes):
+      - Bumped Standards-Version to 4.1.2.
+      - Moved grr-client-templates-installer and grr-server to Suggests field.
+        Thanks to Axel Beckert <abe at debian.org>. (Closes: #867860)
+      - Moved outguess to Recommends field. (see: #882538)
+      - Re-added md5deep to EXCLUDE field because hashdeep source still
+        providing it.
+  * LICENSE: updated the copyright years.
+  * templates/control.part1:
+      - Changed Standards-Version field to be written by gen-control.sh.
+      - Removed no longer needed Suggests field. The gen-control.sh script will
+        provide it.
+  * debian/copyright: updated the copyright years.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Wed, 06 Dec 2017 16:49:41 -0200
+
 forensics-all (1.6) unstable; urgency=medium
 
   * New release to fix dependency conflict and add new packages.
diff --git a/debian/control b/debian/control
index bb2480e..8f29f4c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,25 @@ Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Giovani Augusto Ferreira <giovani at debian.org>,
            Joao Eriberto Mota Filho <eriberto at debian.org>
 Build-Depends: debhelper (>= 10)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.2
 Vcs-Browser: https://anonscm.debian.org/git/forensics/forensics-all.git
 Vcs-Git: https://anonscm.debian.org/git/forensics/forensics-all.git
 
 Package: forensics-all
 Architecture: all
-Suggests: forensics-extra, forensics-extra-gui, forensics-full
+Suggests: forensics-extra,
+          forensics-extra-gui,
+          forensics-full,
+          grr-client-templates-installer,
+          grr-server
+Recommends: outguess
 Depends: aesfix,
          aeskeyfind,
          afflib-tools,
          bruteforce-salted-openssl,
          cewl,
          chaosreader,
-         crack|crack-md5,
+         crack | crack-md5,
          dc3dd,
          dislocker,
          ed2k-hash,
@@ -32,7 +37,6 @@ Depends: aesfix,
          galleta,
          gpart,
          grokevt,
-         grr-server,
          guymager,
          hashdeep,
          hashrat,
@@ -43,7 +47,6 @@ Depends: aesfix,
          missidentify,
          myrescue,
          nasty,
-         outguess,
          pasco,
          pff-tools,
          pipebench,
@@ -87,16 +90,16 @@ Description: Debian Forensics Environment - essential components (metapackage)
  The following packages were included in this metapackage:
  .
    aesfix, aeskeyfind, afflib-tools, bruteforce-salted-openssl, cewl,
-   chaosreader, crack, crack-md5, dc3dd, dislocker, ed2k-hash,
+   chaosreader, crack or crack-md5, dc3dd, dislocker, ed2k-hash,
    ewf-tools, exifprobe, ext3grep, ext4magic, extundelete, fcrackzip,
-   forensics-colorize, galleta, gpart, grokevt, grr-server, guymager,
-   hashdeep, hashrat, mac-robber, magicrescue, memdump, metacam,
-   missidentify, myrescue, nasty, outguess, pasco, pff-tools,
-   pipebench, plaso, pompem, recoverdm, recoverjpeg, reglookup,
-   rekall-core, rephrase, rifiuti, rifiuti2, rkhunter, rsakeyfind,
-   safecopy, scalpel, scrounge-ntfs, shed, sleuthkit, ssdeep, steghide,
-   tableau-parm, undbx, unhide, unhide.rb, vinetto, volatility,
-   volatility-tools, winregfs, wipe, yara
+   forensics-colorize, galleta, gpart, grokevt, guymager, hashdeep,
+   hashrat, mac-robber, magicrescue, memdump, metacam, missidentify,
+   myrescue, nasty, pasco, pff-tools, pipebench, plaso, pompem,
+   recoverdm, recoverjpeg, reglookup, rekall-core, rephrase, rifiuti,
+   rifiuti2, rkhunter, rsakeyfind, safecopy, scalpel, scrounge-ntfs,
+   shed, sleuthkit, ssdeep, steghide, tableau-parm, undbx, unhide,
+   unhide.rb, vinetto, volatility, volatility-tools, winregfs, wipe,
+   yara.
  .
  This package is useful for pentesters, ethical hackers and forensics
  experts.
diff --git a/debian/copyright b/debian/copyright
index 8764201..d0183a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: forensics-all
 
 Files: *
 Copyright: 2015-2017 Giovani Augusto Ferreira <giovani at debian.org>
-           2015-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
+           2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: BSD-3-Clause
 
 License: BSD-3-Clause
diff --git a/gen-control.sh b/gen-control.sh
index 2725d8e..e1b2c5b 100755
--- a/gen-control.sh
+++ b/gen-control.sh
@@ -5,7 +5,7 @@
 # This file is part of the forensics-all.
 #
 # Copyright 2015-2017 Giovani Augusto Ferreira <giovani at debian.org>
-# Copyright 2015-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
+# Copyright 2015-2017 Joao Eriberto Mota Filho <eriberto at debian.org>
 #
 # You can use this program under the BSD-3-Clause conditions.
 
@@ -13,17 +13,50 @@
 ### Variables ###
 #################
 
+# Debian Policy Version (Standards-Version)
+STD_VER=4.1.2
+
 # Here is the list of packages in main/Sid.
 LIST='/var/lib/apt/lists/*debian.org_debian_dists_sid_main_binary-*_Packages'
 
 # These packages will be excluded.
-# Use spaces between names.
+# Use spaces between names. Do not wrap the line.
 # Ex: EXCLUDE='PACKAGE1 PACKAGE2 PACKAGE3'
-EXCLUDE='forensics-all forensics-extra forensics-extra-gui forensics-full'
-
-# These type of files are dependencies and will be excluded.
-DEPENDS='-common|-dbg|-dkms|-doc|^lib|^python'
+#
+# RATIONALE:
+# forensics-all is this package.
+# md5deep still being provided by hashdeep as dummy package.
+EXCLUDE='forensics-all md5deep'
+
+# The following packages will be included as 'logical or' in Depends field. Use
+# one line per occurrence. Do not use spaces inside variables.
+LOGICAL_OR[1]='crack|crack-md5' # See #852846
+LOGICAL_OR[2]=''
+LOGICAL_OR[3]=''
+LOGICAL_OR[4]=''
+LOGICAL_OR[5]=''
+
+# These type of files are dependencies for other packages and will be excluded.
+# Do not use spaces between names. You can use regex here.
+NOTDEPEND='-common|-dbg|-dkms|-doc|^lib|^python'
+
+# The following package will be put in Suggests field (autoexcluded from
+# Depends field).
+#
+# Use spaces between names. Do not wrap the line.
+# Ex: SUGGESTS='PACKAGE1 PACKAGE2 PACKAGE3 PACKAGE4|PACKAGE5'
+#
+# RATIONALE:
+# grr-* - see #867860. grr-client-templates-installer not seems a good idea for
+# a desktop forensics environment.
+SUGGESTS='forensics-extra forensics-extra-gui forensics-full grr-server grr-client-templates-installer'
 
+# The following package will be put in Recommend field (autoexcluded from
+# Depends field).
+#
+# Use spaces between names. Do not wrap the line.
+# Ex: RECOMMENDS='PACKAGE1 PACKAGE2 PACKAGE3 PACKAGE4|PACKAGE5'
+RECOMMENDS='outguess' # See #882538
 
 
 
@@ -31,6 +64,10 @@ DEPENDS='-common|-dbg|-dkms|-doc|^lib|^python'
 ### Main program ###
 ####################
 
+### Initial check
+
+[ -e /usr/bin/wrap-and-sort ] || { echo "ERROR: wrap-and-sort command not found"; exit 1; }
+
 ### Initial message
 
 echo " "
@@ -44,18 +81,54 @@ echo "Press ENTER to continue or Ctrl-C to abort."
 echo " "
 read NOTHING
 
-### Formating exclusions
+### Formatting exclusions
+
+# EXC1 = first exclusions
 
 [ "$EXCLUDE" ] && EXC1=$(echo $EXCLUDE | tr -s " " | sed 's/ /\|/g')
 
+# EXC2 = logical or
+
+for i in 1 2 3 4 5
+do
+    [ "${LOGICAL_OR[$i]}" ] && EXC2="$(echo $EXC2 "${LOGICAL_OR[$i]}" | tr -s " " | sed 's/ /\|/g')"
+done
+
+[ "$EXC2" ] || EXC2="none"
+
+# EXC3 = Suggests
+
+[ "$SUGGESTS" ] && EXC3=$(echo $SUGGESTS | tr -s " " | sed 's/ /\|/g')
+
+[ "$EXC3" ] || EXC3="none"
+
+# EXC4 = Recommends
+
+[ "$RECOMMENDS" ] && EXC4=$(echo $RECOMMENDS | tr -s " " | sed 's/ /\|/g')
+
+[ "$EXC4" ] || EXC4="none"
+
 ### Initial list of packages
 
-mkdir build
+# Depends field
+[ -d build ] || mkdir build
 
 cat $LIST | grep "Maintainer: Debian Forensics" -B6 | grep Package: | \
-cut -d" " -f2 | egrep -v "($DEPENDS)" | \
-egrep -v "($EXC1)" | sort | sed 's/$/,/g' > build/PACKAGES.txt
+cut -d" " -f2 | egrep -v "($NOTDEPEND)" | \
+egrep -v "^($EXC1|$EXC2|$EXC3|$EXC4)" | sort | sed 's/$/,/g' > build/PACKAGES.tmp
+
+for i in 1 2 3 4 5
+do
+    [ "${LOGICAL_OR[$i]}" ] && echo "${LOGICAL_OR[$i]}," >> build/PACKAGES.tmp
+done
 
+cat build/PACKAGES.tmp | sort > build/PACKAGES.txt
+
+# Suggests and Recommends field
+echo "$SUGGESTS" | tr -s " " | sed 's/ /,\n/g' > build/PACKAGES2.txt
+echo "$RECOMMENDS" | tr -s " " | sed 's/ /,\n/g' > build/PACKAGES3.txt
+
+# Showing...
 echo " "
 echo "The packages to be put in DEPENDS field (debian/control) are listed below."
 echo " "
@@ -63,25 +136,51 @@ cat build/PACKAGES.txt | xargs | sed 's/,$//'
 echo " "
 echo "TOTAL: $(cat build/PACKAGES.txt | wc -l) packages."
 echo " "
+if [ "$SUGGESTS" ]
+then
+    echo "For SUGGESTS field, there are the following packages:"
+    echo " "
+    cat build/PACKAGES2.txt | xargs | sed 's/,$//'
+    echo " "
+fi
+if [ "$RECOMMENDS" ]
+then
+    echo "For RECOMMENDS field, there are the following packages:"
+    echo " "
+    cat build/PACKAGES3.txt | xargs | sed 's/,$//'
+    echo " "
+fi
 echo "Press ENTER to continue or Ctrl-C to abort."
 echo " "
 read NOTHING
 
-
 ### Build the final control
 
-cp templates/control.part1 control.NEW
+cat templates/control.part1 | sed "s/X.Y.Z/$STD_VER/" > control.NEW
+
+if [ "$SUGGESTS" ]
+then
+    echo "Suggests: $(cat build/PACKAGES2.txt)" | sed 's/^/            /' | \
+    sed 's/ \+Suggests:/Suggests:/' >> control.NEW
+fi
+
+if [ "$RECOMMENDS" ]
+then
+    echo "Recommends: $(cat build/PACKAGES3.txt)" | sed 's/^/            /' | \
+    sed 's/ \+Recommends:/Recommends:/' >> control.NEW
+fi
 
 echo "Depends: $(cat build/PACKAGES.txt)" | sed 's/^/         /' | \
-sed 's/         Depends:/Depends:/' >> control.NEW
+sed 's/ \+Depends:/Depends:/' >> control.NEW
 
 cat templates/control.part2 >> control.NEW
 
-cat build/PACKAGES.txt | xargs | sed 's/,$//' | fold -sw 69 | sed 's/^/   /' | \
-sed 's/ $//' >> control.NEW
+cat build/PACKAGES.txt | xargs | sed 's/,$/./' | fold -sw 69 | sed 's/^/   /' | \
+sed 's/|/ or /g' | sed 's/ $//' >> control.NEW
 
 cat templates/control.part3 >> control.NEW
 
+wrap-and-sort -f ./control.NEW
 
 ### Final message
 
@@ -90,7 +189,6 @@ echo "The control.NEW file is done. Please, rename to"
 echo "control and move to debian/ directory."
 echo " "
 
-
-### Clean the build directory
+### Remove the build directory
 
 rm -rf build
diff --git a/templates/control.part1 b/templates/control.part1
index 1c57124..c781c5f 100644
--- a/templates/control.part1
+++ b/templates/control.part1
@@ -5,10 +5,9 @@ Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Giovani Augusto Ferreira <giovani at debian.org>,
            Joao Eriberto Mota Filho <eriberto at debian.org>
 Build-Depends: debhelper (>= 10)
-Standards-Version: 4.0.0
+Standards-Version: X.Y.Z
 Vcs-Browser: https://anonscm.debian.org/git/forensics/forensics-all.git
 Vcs-Git: https://anonscm.debian.org/git/forensics/forensics-all.git
 
 Package: forensics-all
 Architecture: all
-Suggests: forensics-extra, forensics-extra-gui, forensics-full

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/forensics-all.git

More information about the forensics-changes mailing list