[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#823911: marked as done (jessie-pu: package debian-security-support/2016.05.24~deb8u1)



Your message dated Sat, 17 Sep 2016 13:08:06 +0100
with message-id <1474114086.2011.126.camel@adam-barratt.org.uk>
and subject line Closing p-u bugs for updates in 8.6
has caused the Debian Bug report #823911,
regarding jessie-pu: package debian-security-support/2016.05.24~deb8u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
823911: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823911
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi release team,

Please find attached the debdiff of a debian-security-support between
current version in Jessie and 2016.05.09+nmu1~deb8u1. The new version:
* updates the list of packages with particular support conditions
* updates French and Spanish l10n.
* includes a new --type earlyend to warn the user about upcoming EOLs.
* closes fixes such as:

https://bugs.debian.org/819493 FTBFS in jessie.
https://bugs.debian.org/762594 Unify binary package along all suites.
https://bugs.debian.org/809249 Solve missing help

This version has been uploaded to unstable and wheezy-security.

Please, accept it for the next Jessie point release.

Cheers,

Santiago
diff -Nru debian-security-support-2015.04.04/check-support-status.hook debian-security-support-2016.05.09+nmu1~deb8u1/check-support-status.hook
--- debian-security-support-2015.04.04/check-support-status.hook	2014-10-26 18:48:03.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/check-support-status.hook	2016-05-10 09:48:45.000000000 +0200
@@ -30,13 +30,12 @@
     TEMPDIR="$(mktemp --tmpdir --directory debian-security-support.postinst.XXXXX)"
     trap "rm -rf '$TEMPDIR'" EXIT
 
-    for MODE in ended limited ; do
+    for MODE in earlyend ended limited ; do
         OUTPUT="$TEMPDIR/output"
         su "$USERNAME" --shell /bin/bash --command "
         check-support-status \
             --type $MODE \
             --no-heading \
-            --list /usr/share/debian-security-support/security-support-$MODE \
             --status-db \"$LIB_DIR/security-support.semaphore\" \
         " >"$OUTPUT"
 
diff -Nru debian-security-support-2015.04.04/check-support-status.in debian-security-support-2016.05.09+nmu1~deb8u1/check-support-status.in
--- debian-security-support-2015.04.04/check-support-status.in	2014-12-08 22:24:42.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/check-support-status.in	2016-05-10 09:49:56.000000000 +0200
@@ -8,7 +8,22 @@
 . gettext.sh
 export TEXTDOMAIN=debian-security-support
 
-VERSION='2014.12.08'
+VERSION='[% VERSION %]'
+
+# Oldest Debian version included in debian-security-support
+DEB_LOWEST_VER_ID=7
+# Version ID for next Debian stable
+DEB_NEXT_VER_ID=9
+
+if [ -z "$DEBIAN_VERSION" ] ; then
+    DEBIAN_VERSION="$(cat /etc/debian_version | grep '[0-9.]' | cut -d. -f1)"
+    [ "$DEBIAN_VERSION" ] || DEBIAN_VERSION="$DEB_NEXT_VER_ID"
+fi
+
+if [ "$DEBIAN_VERSION" -lt "$DEB_LOWEST_VER_ID" ] || [ "$DEBIAN_VERSION" -gt "$DEB_NEXT_VER_ID" ] ; then
+    eval_gettext "Unknown DEBIAN_VERSION \$DEBIAN_VERSION. Valid values from \$DEB_LOWEST_VER_ID and \$DEB_NEXT_VER_ID"; echo
+    exit 1
+fi
 
 LIST=
 NOHEADING=
@@ -17,14 +32,28 @@
 
 NAME="$(basename "$0")"
 
+TODAY="$(date +"%Y%m%d")"
+
 TEMP=$( \
     getopt \
-    --options V \
-    --long list:,no-heading,semaphore:,status-db:,type:,version,Version \
+    --options h,V \
+    --long help,list:,no-heading,semaphore:,status-db:,type:,version,Version \
     -n "$NAME" \
     -- "$@"
 )
 
+usage()
+{
+gettext "Usage: $NAME [OPTION]
+Options:
+  -h, --help                    display this help and exit
+  --list FILE                   database of packages under specific support conditions
+  --no-heading                  skips printing headlines
+  --status-db FILE              database about already reported packages
+  --type SECURITY_SUPPORT_TYPE  earlyend, ended or limited
+  -V, --version                 display version and exit"; echo
+}
+
 if [ $? != 0 ] ; then
     gettext "Failed to parse the command line parameters"; echo
     exit 1
@@ -38,6 +67,10 @@
             eval_gettext "\$name version \$VERSION"; echo
             exit 0
             ;;
+        -h|--help)
+            usage;
+            exit 0
+            ;;
         --list)
             LIST="$2"
             shift 2
@@ -72,11 +105,16 @@
         $0 --type ended --list [% ENDED %] --status-db "$STATUSDB_FILE" $NOHEADING
         echo
         $0 --type limited --list [% LIMITED %] --status-db "$STATUSDB_FILE" $NOHEADING
+        echo
+        $0 --type earlyend --list [% ENDED %] --status-db "$STATUSDB_FILE" $NOHEADING
         exit 0
     fi
     gettext 'E: Need a --type if --list is given'; echo
     exit 1
     ;;
+earlyend)
+    [ "$LIST" ] || LIST=[% ENDED %]
+    ;;
 ended)
     [ "$LIST" ] || LIST=[% ENDED %]
     ;;
@@ -143,17 +181,39 @@
     IFS="${IFS%x}"
     LINE="$([% AWK %] '($1=="'"$SRC_NAME"'"){print}' "$LIST" | head -1)"
     case "$TYPE" in
+        earlyend)
+            TMP_WHEN="$(echo "$LINE" | [% AWK %] '{print $3}')"
+            if [ $(date -d $TMP_WHEN +"%Y%m%d") -gt $TODAY ] ; then
+                ALERT_WHEN=$TMP_WHEN
+                ALERT_VERSION="$(echo "$LINE" | [% AWK %] '{print $2}')"
+                ALERT_WHY="$(
+                    echo "$LINE" |
+                    [% AWK %] '{
+                        $0 = substr ($0, index ($0, $3) + length ($3) + 1);
+                        gsub (/^[ \t]+/,"");
+                        print
+                    }'
+                )"
+            else
+                unset TMP_WHEN
+            fi
+            ;;
         ended)
-            ALERT_VERSION="$(echo "$LINE" | [% AWK %] '{print $2}')"
-            ALERT_WHEN="$(echo "$LINE" | [% AWK %] '{print $3}')"
-            ALERT_WHY="$(
-                echo "$LINE" |
-                [% AWK %] '{
-                    $0 = substr ($0, index ($0, $3) + length ($3) + 1);
-                    gsub (/^[ \t]+/,"");
-                    print
-                }'
-            )"
+            TMP_WHEN="$(echo "$LINE" | [% AWK %] '{print $3}')"
+            if [ $(date -d $TMP_WHEN +"%Y%m%d") -le $TODAY ] ; then
+                ALERT_VERSION="$(echo "$LINE" | [% AWK %] '{print $2}')"
+                ALERT_WHEN=$TMP_WHEN
+                ALERT_WHY="$(
+                    echo "$LINE" |
+                    [% AWK %] '{
+                        $0 = substr ($0, index ($0, $3) + length ($3) + 1);
+                        gsub (/^[ \t]+/,"");
+                        print
+                    }'
+                )"
+            else
+                unset TMP_WHEN
+            fi
             ;;
         limited)
             ALERT_VERSION=
@@ -172,33 +232,36 @@
 
     [% AWK %] '($3=="'"$SRC_NAME"'"){print $1" "$2}' "$INSTALLED_LIST" | \
     while read BIN_NAME BIN_VERSION ; do
-        if \
-            [ -z "$ALERT_VERSION" ] ||
-            [ "$BIN_VERSION" = "$ALERT_VERSION" ] ||
-            dpkg --compare-versions "$BIN_VERSION" '<=' "$ALERT_VERSION"
-        then
-            # need to alert, but check status db first
-            TOKEN="$BIN_NAME/$BIN_VERSION"
-            if [ "$STATUSDB_FILE" ] && [ -f "$STATUSDB_FILE" ]; then
-                if grep -qFx "$TOKEN" "$STATUSDB_FILE" ; then
-                    continue
-                fi
-            fi
-            echo "$BIN_NAME $BIN_VERSION" >>"$TD/$SRC_NAME.bin"
-            echo "$ALERT_VERSION" >"$TD/$SRC_NAME.version"
-            echo "$ALERT_WHEN" >"$TD/$SRC_NAME.when"
-            echo "$ALERT_WHY" >"$TD/$SRC_NAME.why"
-            if [ "$STATUSDB_FILE" ] ; then
-                # add to status db, remove any older entries
-                if [ -f "$STATUSDB_FILE" ]; then
-                    TEMPFILE="$(mktemp --tmpdir="$(dirname "$STATUSDB_FILE")")"
-                    [% AWK %] -F/ '($1!="'"$BIN_NAME"'"){print}' \
-                        <"$STATUSDB_FILE" >"$TEMPFILE"
-                    mv "$TEMPFILE" "$STATUSDB_FILE"
+        # for earlyend and ended, check packages actually affected (if TMP_WHEN not null)
+        if [ -n "$TMP_WHEN" ] || [ "$TYPE" = limited ] ; then
+            if \
+                [ -z "$ALERT_VERSION" ] ||
+                [ "$BIN_VERSION" = "$ALERT_VERSION" ] ||
+                dpkg --compare-versions "$BIN_VERSION" '<=' "$ALERT_VERSION"
+            then
+                # need to alert, but check status db first
+                TOKEN="$BIN_NAME/$BIN_VERSION"
+                if [ "$STATUSDB_FILE" ] && [ -f "$STATUSDB_FILE" ]; then
+                    if grep -qFx "$TOKEN" "$STATUSDB_FILE" ; then
+                        continue
+                    fi
                 fi
-                echo "$TOKEN" >>"$STATUSDB_FILE"
-            fi  # maintain status db
-        fi # package BIN_NAME's version is not supported
+                echo "$BIN_NAME $BIN_VERSION" >>"$TD/$SRC_NAME.bin"
+                echo "$ALERT_VERSION" >"$TD/$SRC_NAME.version"
+                echo "$ALERT_WHEN" >"$TD/$SRC_NAME.when"
+                echo "$ALERT_WHY" >"$TD/$SRC_NAME.why"
+                if [ "$STATUSDB_FILE" ] ; then
+                    # add to status db, remove any older entries
+                    if [ -f "$STATUSDB_FILE" ]; then
+                        TEMPFILE="$(mktemp --tmpdir="$(dirname "$STATUSDB_FILE")")"
+                        [% AWK %] -F/ '($1!="'"$BIN_NAME"'"){print}' \
+                            <"$STATUSDB_FILE" >"$TEMPFILE"
+                        mv "$TEMPFILE" "$STATUSDB_FILE"
+                    fi
+                    echo "$TOKEN" >>"$STATUSDB_FILE"
+                fi  # maintain status db
+            fi # package BIN_NAME's version is not supported
+        fi
     done # read binary name and version for matching source name
 done # each source package from intersection
 
@@ -209,6 +272,16 @@
 
 if [ -z "$NOHEADING" ] ; then
     case "$TYPE" in
+        earlyend)
+            gettext \
+"Future end of support for one or more packages
+
+Unfortunately, it will be needed to end security support for some
+packages before the end of the regular security maintenance life cycle.
+
+The following packages found on this system are affected by this:"
+            echo
+            ;;
         ended)
             gettext \
 "Ended security support for one or more packages
@@ -238,6 +311,9 @@
     ALERT_WHY="$(cat "$TD/$SRC_NAME.why")"
     echo
     case "$TYPE" in
+        earlyend)
+            eval_gettext "* Source:\$SRC_NAME, will end on \$ALERT_WHEN"; echo
+            ;;
         ended)
             eval_gettext "* Source:\$SRC_NAME, ended on \$ALERT_WHEN at version \$ALERT_VERSION"; echo
             ;;
diff -Nru debian-security-support-2015.04.04/debian/changelog debian-security-support-2016.05.09+nmu1~deb8u1/debian/changelog
--- debian-security-support-2015.04.04/debian/changelog	2015-04-06 18:59:22.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/debian/changelog	2016-05-10 09:53:44.000000000 +0200
@@ -1,3 +1,73 @@
+debian-security-support (2016.05.09+nmu1~deb8u1) jessie; urgency=medium
+
+  * Non-maintainer upload.
+  * Rebuild for jessie.
+  * Remove postrm file, accidentally included in the previous release
+    (Closes: #823563)
+
+ -- Santiago Ruano Rincón <santiagorr@riseup.net>  Tue, 10 May 2016 09:53:30 +0200
+
+debian-security-support (2016.05.04+nmu1) unstable; urgency=medium
+
+  * Unify binary package for all distributions. check-security-support
+    evaluates the debian version where it runs upon, or according to a
+    DEBIAN_VERSION env variable (Closes: #762594).
+    - Keep a symlink to security-support-ended to avoid backward issues.
+  * check-support-status, man page: Parse version from debian/changelog
+  * Update messages.po, Spanish and French translations.
+  * Update packages not supported in Wheezy LTS.
+
+ -- Santiago Ruano Rincón <santiagorr@riseup.net>  Wed, 04 May 2016 16:07:40 +0200
+
+debian-security-support (2016.03.30+nmu1) unstable; urgency=medium
+
+  [ Salvatore Bonaccorso ]
+  * Mark virtualbox as unsupported in Wheezy (Closes: #812822)
+
+  [ Santiago Ruano Rincón ]
+  * Take into account future end of security support (Closes: #818843).
+    - Include early end support checks in t/check-support-status.t.
+    - Update man page.
+  * debian/rules: Generate right debian version from /etc/debian_version
+    (Closes: #819493).
+
+ -- Santiago Ruano Rincón <santiago@debian.org>  Wed, 30 Mar 2016 19:20:15 +0200
+
+debian-security-support (2016.01.07) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Salvatore Bonaccorso ]
+  * Mark typo3-src as unsupported in Wheezy.
+    Thanks to Holger Levsen <holger@layer-acht.org> (Closes: #793454)
+
+  [ Raphaël Hertzog ]
+  * Mark wine-gecko-2.21 and wine-gecko-2.24 as unsupported in all
+    releases. Closes: #804058
+  * Mark virtualbox-ose as unsupported in Squeeze (cf DLA 372-1).
+  * Mark qtwebkit-opensource-src as unsupported in all releases.
+    Closes: #799189
+  * Mark redmine as unsupported in squeeze and wheezy due to the fact that
+    it depends on rails which is not supported.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Thu, 07 Jan 2016 17:11:33 +0100
+
+debian-security-support (2015.07.11) unstable; urgency=medium
+
+  * Team upload.
+  * Add list of packages not supported in stretch.
+    The list ist empty for the time being.
+    Fixes "FTBFS: cp: cannot stat 'security-support-ended.deb9': No such
+    file or directory" when building in stretch and sid.
+    Thanks to Daniel Schepler <dschepler@gmail.com> for the report
+    (Closes: #792007)
+  * Declare compliance with Debian policy 3.9.6
+  * Use canonical URI for Vcs-Git field
+  * Add Vcs-Browser fields in debian/control file
+  * Prepare check-support-status for release
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 11 Jul 2015 15:00:48 +0200
+
 debian-security-support (2015.04.04) unstable; urgency=high
 
   * Add wireshark to unsupported packages in Squeeze (Closes: #774312)
diff -Nru debian-security-support-2015.04.04/debian/control debian-security-support-2016.05.09+nmu1~deb8u1/debian/control
--- debian-security-support-2015.04.04/debian/control	2014-09-12 16:42:18.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/debian/control	2016-05-10 09:45:36.000000000 +0200
@@ -14,8 +14,9 @@
     mawk,
     original-awk,
     xmlto,
-Standards-Version: 3.9.5
-Vcs-git: git://git.debian.org/git/collab-maint/debian-security-support.git/
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/collab-maint/debian-security-support.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/debian-security-support.git
 
 Package: debian-security-support
 Architecture: all
diff -Nru debian-security-support-2015.04.04/debian/debian-security-support.postinst debian-security-support-2016.05.09+nmu1~deb8u1/debian/debian-security-support.postinst
--- debian-security-support-2015.04.04/debian/debian-security-support.postinst	2014-12-06 13:49:21.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/debian/debian-security-support.postinst	2016-05-10 09:48:45.000000000 +0200
@@ -27,13 +27,12 @@
     TEMPDIR="$(mktemp --tmpdir --directory debian-security-support.postinst.XXXXX)"
     trap "rm -rf '$TEMPDIR'" EXIT
 
-    for MODE in ended limited ; do
+    for MODE in earlyend ended limited ; do
         OUTPUT="$TEMPDIR/output"
         su "$USERNAME" --shell /bin/bash --command "
         check-support-status \
             --type $MODE \
             --no-heading \
-            --list /usr/share/debian-security-support/security-support-$MODE \
             --status-db \"$LIB_DIR/security-support.semaphore\" \
         " >"$OUTPUT"
 
diff -Nru debian-security-support-2015.04.04/debian/rules debian-security-support-2016.05.09+nmu1~deb8u1/debian/rules
--- debian-security-support-2015.04.04/debian/rules	2014-10-26 18:48:03.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/debian/rules	2016-05-10 09:48:45.000000000 +0200
@@ -1,6 +1,13 @@
 #!/usr/bin/make -f
 
-DEBIAN_VERSION ?= $(shell LANG=C dpkg -l base-files | awk '($$1=="ii"){print $$3}' | cut -d. -f1)
+NEXT_VERSION_ID=9
+
+DEBIAN_VERSION ?= $(shell cat /etc/debian_version | grep '[0-9.]' | cut -d. -f1)
+ifeq (,$(DEBIAN_VERSION))
+  DEBIAN_VERSION=$(NEXT_VERSION_ID)
+endif
+
+VER=$(shell dpkg-parsechangelog | grep "^Version" | awk '{print $$2}' )
 
 %:
 	dh $@
@@ -24,7 +31,7 @@
 
 override_dh_install:
 	mkdir -p debian/debian-security-support/usr/share/debian-security-support/
-	cp security-support-ended.deb$(DEBIAN_VERSION) debian/debian-security-support/usr/share/debian-security-support/security-support-ended
+	cp security-support-ended.deb* debian/debian-security-support/usr/share/debian-security-support/
 	cp security-support-limited debian/debian-security-support/usr/share/debian-security-support/security-support-limited
 	dh_install --fail-missing
 
@@ -34,8 +41,17 @@
 		lang="$$(basename "$$man" | sed -e 's/^check-support-status\.txt\.//')" ; \
 		a2x --format=manpage --no-xmllint "$$man" ; \
 		mv man/check-support-status.1 "man/check-support-status.$$lang.1" ; \
+		sed -i -e "s/\[% VERSION %\]/$(VER)/" "man/check-support-status.$$lang.1" ; \
 	done
 	a2x --format=manpage --no-xmllint man/check-support-status.txt
+	sed -i -e "s/\[% VERSION %\]/$(VER)/" man/check-support-status.1
 	# ignore an empty manpage created during build
 	-rm debian/debian-security-support/usr/share/man/man1/check-support-status.1p
 	dh_installman
+
+override_dh_link:
+	# After Closing: #762594, check-security-status reads the debian version
+	# specific list file for ended and earlyend. This symlink is aimed to
+	# prevent breaking anything relying on the security-support-ended list
+	# file.
+	dh_link usr/share/debian-security-support/security-support-ended.deb"$(DEBIAN_VERSION)" usr/share/debian-security-support/security-support-ended
diff -Nru debian-security-support-2015.04.04/Makefile.PL debian-security-support-2016.05.09+nmu1~deb8u1/Makefile.PL
--- debian-security-support-2015.04.04/Makefile.PL	2014-10-26 18:48:03.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/Makefile.PL	2016-05-10 09:48:45.000000000 +0200
@@ -5,10 +5,16 @@
 use warnings;
 
 use ExtUtils::MakeMaker;
+use Dpkg::Changelog::Parse qw(changelog_parse);
+
+my $dchfile = 'debian/changelog';
+my $changelog = changelog_parse(file => $dchfile);
+my $VERSION=$changelog->{Version};
 
 WriteMakefile (
     'NAME' =>       'debian-security-support',
     'AUTHOR' =>     'Christoph Biedl <debian.axhn@manchmal.in-ulm.de>',
+    'VERSION' =>    $VERSION,
     'EXE_FILES' =>  [ qw(
         check-support-status
         check-support-status.hook
@@ -19,6 +25,7 @@
     return <<__EOS__;
 
 check-support-status: check-support-status.in
-	TPAGERC=template-vars tpage check-support-status.in >check-support-status
+	TPAGERC=template-vars tpage --define VERSION=$VERSION check-support-status.in >check-support-status
+
 __EOS__
 }
diff -Nru debian-security-support-2015.04.04/man/check-support-status.txt debian-security-support-2016.05.09+nmu1~deb8u1/man/check-support-status.txt
--- debian-security-support-2015.04.04/man/check-support-status.txt	2014-09-12 21:27:37.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/man/check-support-status.txt	2016-05-10 09:48:45.000000000 +0200
@@ -4,15 +4,16 @@
 
 NAME
 ----
-check-support-status - check installed packages for security support
+check-support-status - check installed packages for security support (debian-security-support)
 
 VERSION
 -------
-Version 2014.05.29
+Version [% VERSION %]
 
 SYNOPSIS
 --------
-Search for packages with ended or limited support:
+Search for packages whose support is limited, has already ended or
+will end earlier than the distribution's end of life:
 
 ----
     check-support-status
@@ -32,9 +33,19 @@
 -------
 *--list* 'FILE'::
 
-Use the given file as the database of which packages are no longer
-supported or have limited support. The file format is plain text in
-columns, separated by one or more whitespace characters.
+Use the given file as the database of packages whose support ends at a
+particular date or that is limited by specific conditions. The file
+format is plain text in columns, separated by one or more whitespace
+characters.
++
+For `--type earlyend`:
++
+--
+* source package name
+* last package version that will be supported
+* the date support will end
+* the rest (optional): details, and/or a URL for further information.
+--
 +
 For `--type ended`:
 +
@@ -52,8 +63,14 @@
 * the rest (optional): details, and/or a URL for further information.
 --
 +
-If no "--list" is provided, the script is run for both ended and
-limited support, using the lists shipped in the package.
+If no "--list" is provided, the script is run for limited and
+date-defined end of support, using the lists shipped in the package.
++
+By default, check-support-status evaluates the status of the packages
+according to the Debian version where it runs upon. This behavior can
+be modified using the DEBIAN_VERSION environment variable, e.g.
+
+    DEBIAN_VERSION=9 check-support-status
 
 *--no-heading*::
 
@@ -70,6 +87,8 @@
 
 One of the following:
 
+   * "earlyend": Alert for packages whose support will end earlier
+                 than the distribution's.
    * "ended": Alert for packages where security support has ended.
    * "limited": Alert for packages where security support is limited.
 
diff -Nru debian-security-support-2015.04.04/po/es.po debian-security-support-2016.05.09+nmu1~deb8u1/po/es.po
--- debian-security-support-2015.04.04/po/es.po	2014-07-19 19:00:40.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/po/es.po	2016-05-10 09:48:45.000000000 +0200
@@ -6,7 +6,7 @@
 # - Initial translation
 #       Matías Bellone <matiasbellone+debian@gmail.com>, 2014
 #
-#  Traductores, si no conoce el formato PO, merece la pena leer la 
+#  Traductores, si no conoce el formato PO, merece la pena leer la
 #  documentación de gettext, especialmente las secciones dedicadas a este
 #  formato, por ejemplo ejecutando:
 #         info -n '(gettext)PO Files'
@@ -26,42 +26,78 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-26 11:31+0200\n"
-"PO-Revision-Date: 2014-06-27 21:10-0300\n"
-"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
+"POT-Creation-Date: 2016-05-01 19:01+0200\n"
+"PO-Revision-Date: 2016-05-01 19:03+0200\n"
+"Last-Translator: Santiago R.R. <santiagorr@riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: check-support-status:31
+#: check-support-status.in:24
+#, sh-format
+msgid ""
+"Unknown DEBIAN_VERSION $DEBIAN_VERSION. Valid values from $DEB_LOWEST_VER_ID "
+"and $DEB_NEXT_VER_ID"
+msgstr ""
+"DEBIAN_VERSION $DEBIAN_VERSION desconocida. Valores válidos entre "
+"$DEB_LOWEST_VER_ID y $DEB_NEXT_VER_ID"
+
+#: check-support-status.in:58
 msgid "Failed to parse the command line parameters"
 msgstr "No se pudieron procesar los parámetros"
 
-#: check-support-status:40
+#: check-support-status.in:67
 #, sh-format
 msgid "$name version $VERSION"
 msgstr "$name versión $VERSION"
 
-#: check-support-status:72
+#: check-support-status.in:96
 msgid "E: Internal error"
-msgstr "E: Error Interno"
+msgstr "E: Error interno"
+
+#: check-support-status.in:112
+msgid "E: Need a --type if --list is given"
+msgstr "E: Se necesita un --type si se especifica --list"
 
-#: check-support-status:104
+#: check-support-status.in:125
+#, sh-format
+msgid "E: Unknown --type '$TYPE'"
+msgstr "E: --type '$TYPE' desconocido"
+
+#: check-support-status.in:147
 msgid "E: Cannot detect dpkg version, assuming wheezy or newer"
 msgstr "E: no se pudo detectar la versión de dpkg, se asume wheezy o más nuevo"
 
-#: check-support-status:205
+#: check-support-status.in:277
+msgid ""
+"Future end of support for one or more packages\n"
+"\n"
+"Unfortunately, it will be needed to end security support for some\n"
+"packages before the end of the regular security maintenance life cycle.\n"
+"\n"
+"The following packages found on this system are affected by this:"
+msgstr ""
+"El soporte de seguridad finalizará para uno o más paquetes\n"
+"\n"
+"Desafortunadamente, es necesario interrumpir el soporte de seguridad\n"
+"antes del fin del ciclo de vida convencional de mantenimiento de\n"
+"seguridad.\n"
+"\n"
+"Los siguientes paquetes instalados en su sistema se encuentran afectados:"
+
+#: check-support-status.in:287
 msgid ""
-"Security support has ended for one or more packages\n"
+"Ended security support for one or more packages\n"
 "\n"
-"Unfortunately, security support for some packages needed to be stopped\n"
-"before the end of the regular security maintenance life cycle.\n"
+"Unfortunately, it has been necessary to end security support for some\n"
+"packages before the end of the regular security maintenance life cycle.\n"
 "\n"
-"The following packages found on your system are affected by this:"
+"The following packages found on this system are affected by this:"
 msgstr ""
 "El soporte de seguridad finalizó para uno o más paquetes\n"
 "\n"
@@ -71,13 +107,14 @@
 "\n"
 "Los siguientes paquetes instalados en su sistema se encuentran afectados:"
 
-#: check-support-status:215
+#: check-support-status.in:297
 msgid ""
-"Security support is limited for one or more packages\n"
+"Limited security support for one or more packages\n"
 "\n"
-"Unfortunately, security support for some packages had to be limited.\n"
+"Unfortunately, it has been necessary to limit security support for some\n"
+"packages.\n"
 "\n"
-"The following packages found on your system are affected by this:"
+"The following packages found on this system are affected by this:"
 msgstr ""
 "Soporte de seguridad limitado para uno o más paquetes\n"
 "\n"
@@ -86,31 +123,36 @@
 "\n"
 "Los siguientes paquetes instalados en su sistema se encuentran afectados:"
 
+#: check-support-status.in:315
+#, sh-format
+msgid "* Source:$SRC_NAME, will end on $ALERT_WHEN"
+msgstr "* Fuente:$SRC_NAME, finalizado el $ALERT_WHEN"
 
-#: check-support-status:232
+#: check-support-status.in:318
 #, sh-format
 msgid "* Source:$SRC_NAME, ended on $ALERT_WHEN at version $ALERT_VERSION"
-msgstr "* Fuente:$SRC_NAME, finalizado el $ALERT_WHEN en la versión $ALERT_VERSION"
+msgstr ""
+"* Fuente:$SRC_NAME, finalizado el $ALERT_WHEN en la versión $ALERT_VERSION"
 
-#: check-support-status:235
+#: check-support-status.in:321
 #, sh-format
 msgid "* Source:$SRC_NAME"
 msgstr "* Fuente:$SRC_NAME"
 
-#: check-support-status:239
+#: check-support-status.in:325
 #, sh-format
 msgid "  Details: $ALERT_WHY"
 msgstr "  Detalles: $ALERT_WHY"
 
-#: check-support-status:242
+#: check-support-status.in:328
 msgid "  Affected binary package:"
 msgstr "  Paquete binario afectado:"
 
-#: check-support-status:244
+#: check-support-status.in:330
 msgid "  Affected binary packages:"
 msgstr "  Paquetes binarios afectados:"
 
-#: check-support-status:247
+#: check-support-status.in:333
 #, sh-format
 msgid "  - $BIN_NAME (installed version: $BIN_VERSION)"
 msgstr "  - $BIN_NAME (versión instalada: $BIN_VERSION)"
diff -Nru debian-security-support-2015.04.04/po/fr.po debian-security-support-2016.05.09+nmu1~deb8u1/po/fr.po
--- debian-security-support-2015.04.04/po/fr.po	2014-07-18 20:19:35.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/po/fr.po	2016-05-10 09:48:45.000000000 +0200
@@ -6,36 +6,73 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-security-support\n"
-"Report-Msgid-Bugs-To: debian-security-support@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-28 10:24+0000\n"
-"PO-Revision-Date: 2014-06-12 11:31+0100\n"
-"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-01 19:01+0200\n"
+"PO-Revision-Date: 2016-05-01 19:04+0200\n"
+"Last-Translator: Santiago R.R. <santiagorr@riseup.net>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: check-support-status.in:29
+#: check-support-status.in:24
+#, sh-format
+msgid ""
+"Unknown DEBIAN_VERSION $DEBIAN_VERSION. Valid values from $DEB_LOWEST_VER_ID "
+"and $DEB_NEXT_VER_ID"
+msgstr ""
+"DEBIAN_VERSION $DEBIAN_VERSION inconnue. Valeurs valides entre "
+"$DEB_LOWEST_VER_ID et $DEB_NEXT_VER_ID"
+
+#: check-support-status.in:58
 msgid "Failed to parse the command line parameters"
 msgstr "Échec de l'analyse des paramètres de la ligne de commande"
 
-#: check-support-status.in:38
+#: check-support-status.in:67
 #, sh-format
 msgid "$name version $VERSION"
 msgstr "$name version $VERSION"
 
-#: check-support-status.in:63
+#: check-support-status.in:96
 msgid "E: Internal error"
 msgstr "E : Erreur interne"
 
-#: check-support-status.in:95
+#: check-support-status.in:112
+msgid "E: Need a --type if --list is given"
+msgstr "E : Un --type est nécessaire quand --list est utilisé"
+
+#: check-support-status.in:125
+#, sh-format
+msgid "E: Unknown --type '$TYPE'"
+msgstr "E : --type '$TYPE' non reconnu"
+
+#: check-support-status.in:147
 msgid "E: Cannot detect dpkg version, assuming wheezy or newer"
 msgstr ""
 "E : Impossible d'identifier la version de dpkg, on suppose qu'il s'agit de "
 "wheezy ou plus récent"
 
-#: check-support-status.in:196
+#: check-support-status.in:277
+msgid ""
+"Future end of support for one or more packages\n"
+"\n"
+"Unfortunately, it will be needed to end security support for some\n"
+"packages before the end of the regular security maintenance life cycle.\n"
+"\n"
+"The following packages found on this system are affected by this:"
+msgstr ""
+"Le suivi des mises à jour de sécurité sera bientôt arrêté pour un ou "
+"plusieurs paquets\n"
+"\n"
+"Malheureusement, il est nécessaire d'interrompre le suivi des mises à jour\n"
+"de sécurité de certains paquets avant la fin du cycle de maintenance "
+"théorique\n"
+"\n"
+"Sur ce système, les paquets suivants sont concernés :"
+
+#: check-support-status.in:287
 msgid ""
 "Ended security support for one or more packages\n"
 "\n"
@@ -54,7 +91,7 @@
 "\n"
 "Sur ce système, les paquets suivants sont concernés :"
 
-#: check-support-status.in:206
+#: check-support-status.in:297
 msgid ""
 "Limited security support for one or more packages\n"
 "\n"
@@ -65,36 +102,41 @@
 msgstr ""
 "Suivi limité des mises à jour de sécurité pour un ou plusieurs paquets\n"
 "\n"
-"Malheureusement, il a été nécessaire de limiter le suivi des mises à jour "
-"de certains paquets\n"
+"Malheureusement, il a été nécessaire de limiter le suivi des mises à jour de "
+"certains paquets\n"
 "\n"
 "Sur ce système, les paquets suivants sont concernés :"
 
-#: check-support-status.in:224
+#: check-support-status.in:315
+#, sh-format
+msgid "* Source:$SRC_NAME, will end on $ALERT_WHEN"
+msgstr "* Source : $SRC_NAME, terminera le $ALERT_WHEN"
+
+#: check-support-status.in:318
 #, sh-format
 msgid "* Source:$SRC_NAME, ended on $ALERT_WHEN at version $ALERT_VERSION"
 msgstr ""
 "* Source : $SRC_NAME, terminé sur $ALERT_WHEN pour la version $ALERT_VERSION"
 
-#: check-support-status.in:227
+#: check-support-status.in:321
 #, sh-format
 msgid "* Source:$SRC_NAME"
 msgstr "* Source : $SRC_NAME"
 
-#: check-support-status.in:231
+#: check-support-status.in:325
 #, sh-format
 msgid "  Details: $ALERT_WHY"
 msgstr "  Détails : $ALERT_WHY"
 
-#: check-support-status.in:234
+#: check-support-status.in:328
 msgid "  Affected binary package:"
 msgstr "  Paquet binaire affecté :"
 
-#: check-support-status.in:236
+#: check-support-status.in:330
 msgid "  Affected binary packages:"
 msgstr "  Paquets binaires affectés :"
 
-#: check-support-status.in:239
+#: check-support-status.in:333
 #, sh-format
 msgid "  - $BIN_NAME (installed version: $BIN_VERSION)"
 msgstr "  - $BIN_NAME (version installée : $BIN_VERSION)"
diff -Nru debian-security-support-2015.04.04/po/messages.po debian-security-support-2016.05.09+nmu1~deb8u1/po/messages.po
--- debian-security-support-2015.04.04/po/messages.po	2014-09-07 14:33:30.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/po/messages.po	2016-05-10 09:48:45.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-07 14:19+0200\n"
+"POT-Creation-Date: 2016-05-01 19:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,33 +17,50 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: check-support-status.in:29
+#: check-support-status.in:24
+#, sh-format
+msgid ""
+"Unknown DEBIAN_VERSION $DEBIAN_VERSION. Valid values from $DEB_LOWEST_VER_ID "
+"and $DEB_NEXT_VER_ID"
+msgstr ""
+
+#: check-support-status.in:58
 msgid "Failed to parse the command line parameters"
 msgstr ""
 
-#: check-support-status.in:38
+#: check-support-status.in:67
 #, sh-format
 msgid "$name version $VERSION"
 msgstr ""
 
-#: check-support-status.in:63
+#: check-support-status.in:96
 msgid "E: Internal error"
 msgstr ""
 
-#: check-support-status.in:77
+#: check-support-status.in:112
 msgid "E: Need a --type if --list is given"
 msgstr ""
 
-#: check-support-status.in:93
+#: check-support-status.in:125
 #, sh-format
 msgid "E: Unknown --type '$TYPE'"
 msgstr ""
 
-#: check-support-status.in:117
+#: check-support-status.in:147
 msgid "E: Cannot detect dpkg version, assuming wheezy or newer"
 msgstr ""
 
-#: check-support-status.in:221
+#: check-support-status.in:277
+msgid ""
+"Future end of support for one or more packages\n"
+"\n"
+"Unfortunately, it will be needed to end security support for some\n"
+"packages before the end of the regular security maintenance life cycle.\n"
+"\n"
+"The following packages found on this system are affected by this:"
+msgstr ""
+
+#: check-support-status.in:287
 msgid ""
 "Ended security support for one or more packages\n"
 "\n"
@@ -53,7 +70,7 @@
 "The following packages found on this system are affected by this:"
 msgstr ""
 
-#: check-support-status.in:231
+#: check-support-status.in:297
 msgid ""
 "Limited security support for one or more packages\n"
 "\n"
@@ -63,30 +80,35 @@
 "The following packages found on this system are affected by this:"
 msgstr ""
 
-#: check-support-status.in:249
+#: check-support-status.in:315
+#, sh-format
+msgid "* Source:$SRC_NAME, will end on $ALERT_WHEN"
+msgstr ""
+
+#: check-support-status.in:318
 #, sh-format
 msgid "* Source:$SRC_NAME, ended on $ALERT_WHEN at version $ALERT_VERSION"
 msgstr ""
 
-#: check-support-status.in:252
+#: check-support-status.in:321
 #, sh-format
 msgid "* Source:$SRC_NAME"
 msgstr ""
 
-#: check-support-status.in:256
+#: check-support-status.in:325
 #, sh-format
 msgid "  Details: $ALERT_WHY"
 msgstr ""
 
-#: check-support-status.in:259
+#: check-support-status.in:328
 msgid "  Affected binary package:"
 msgstr ""
 
-#: check-support-status.in:261
+#: check-support-status.in:330
 msgid "  Affected binary packages:"
 msgstr ""
 
-#: check-support-status.in:264
+#: check-support-status.in:333
 #, sh-format
 msgid "  - $BIN_NAME (installed version: $BIN_VERSION)"
 msgstr ""
diff -Nru debian-security-support-2015.04.04/security-support-ended.deb6 debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb6
--- debian-security-support-2015.04.04/security-support-ended.deb6	2015-04-06 18:56:27.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb6	2016-05-10 09:45:37.000000000 +0200
@@ -39,6 +39,7 @@
 qemu            0.12.5+dfsg-3squeeze4   2014-12-11 https://bugs.debian.org/772858
 qemu-kvm        0.12.5+dfsg-5+squeeze11 2014-05-31 Not supported in squeeze LTS
 rails           2.3.5-1.2+squeeze8      2014-05-31 Not supported in squeeze LTS
+redmine         1.0.1-2                 2014-05-31 Depends on rails which is not supported
 serendipity     1.5.3-2                 2014-05-31 Not supported in squeeze LTS
 smarty          2.6.26-0.2+squeeze1     2014-05-31 Not supported in squeeze LTS
 smarty3         3.0~rc1-1               2014-05-31 Not supported in squeeze LTS
@@ -46,6 +47,7 @@
 textpattern     4.2.0-2                 2014-12-13 https://lists.debian.org/debian-lts/2014/12/msg00009.html
 turba2          2.3.4+debian0-1         2014-05-31 Not supported in squeeze LTS
 typo3-src       4.3.9+dfsg1-1+squeeze9  2014-05-31 Not supported in squeeze LTS
+virtualbox-ose  3.2.28-dfsg-1+squeeze1  2015-12-18 https://lists.debian.org/debian-lts-announce/2015/12/msg00014.html
 vlc             1.1.3-1squeeze6         2014-05-31 Not supported in squeeze LTS
 wireshark       1.2.11-6+squeeze15      2014-12-31 Not supported in squeeze LTS for analysis of untrusted traffic
 xen             4.0.1-5.11              2014-05-31 Not supported in squeeze LTS
diff -Nru debian-security-support-2015.04.04/security-support-ended.deb7 debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb7
--- debian-security-support-2015.04.04/security-support-ended.deb7	2015-04-06 18:58:23.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb7	2016-05-10 09:45:37.000000000 +0200
@@ -1,22 +1,40 @@
 
-# List of packages where security support has ended
+# List of packages whose security support ends before the distribution EOL
 
 # File format: Columns, separated by one or more space characters
 # 1. source package name
 # 2. last version with support
 #    Important: If there have been binNMUs, enter the highest version
 #    number used
-# 3. Date when support ended, in the form YYYY-mm-dd
+# 3. Date when support ended or will end, in the form YYYY-mm-dd
 # 4. Descriptive text or URL with more details (optional)
 #    In the program's output, this is prefixed with "Details:"
 
-iceape          2.7.12-1+alpha          2013-12-16 https://lists.debian.org/debian-security-announce/2013/msg00233.html
-chromium-browser 37.0.2062.120-1~deb7u1 2015-01-31 https://lists.debian.org/debian-security-announce/2015/msg00031.html
-ruby-actionmailer-2.3 2.3.14-3          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-actionpack-2.3 2.3.14-5          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-activerecord-2.3 2.3.14-6          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-activeresource-2.3 2.3.14-3          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-actionmailer-2.3 2.3.14-3          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-activesupport-2.3 2.3.14-7         2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
-ruby-rails-2.3 2.3.14-4          2014-07-19 https://lists.debian.org/debian-security-announce/2014/msg00164.html
+chromium-browser         37.0.2062.120-1~deb7u1  2015-01-31  https://lists.debian.org/debian-security-announce/2015/msg00031.html
+iceape                   2.7.12-1+alpha          2013-12-16  https://lists.debian.org/debian-security-announce/2013/msg00233.html
+ruby-actionmailer-2.3    2.3.14-3                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-actionpack-2.3      2.3.14-5                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-activerecord-2.3    2.3.14-6                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-activeresource-2.3  2.3.14-3                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-actionmailer-2.3    2.3.14-3                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-activesupport-2.3   2.3.14-7                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+ruby-rails-2.3           2.3.14-4                2014-07-19  https://lists.debian.org/debian-security-announce/2014/msg00164.html
+redmine                  1.4.4+dfsg1-2+deb7u1    2014-07-19  Depends on ruby-rails-2.3 which is not supported
+tomcat6                  6.0.45+dfsg-1~deb7u1    2016-12-31  https://tomcat.apache.org/tomcat-60-eol.html
+typo3-src                4.5.19+dfsg1-5+wheezy4  2015-07-23  https://lists.debian.org/debian-security-announce/2015/msg00210.html
+virtualbox               4.1.42-dfsg-1+deb7u1    2016-01-27  https://lists.debian.org/debian-security-announce/2016/msg00024.html
 
+# Packages below are no longer supported in Wheezy during the LTS period
+mantis                  1.2.18-1                2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00019.html)
+movabletype-opensource  5.1.4+dfsg-4+deb7u3     2016-02-06  Not supported in Debian LTS (http://lists.debian.org/20151104190529.GY7054@urchin.earth.li)
+openjdk-6               6b38-1.13.10-1~deb7u1   2016-04-15  Not supported in Wheezy LTS https://lists.debian.org/debian-lts/2016/02/msg00153.html
+openswan                1:2.6.37-3              2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00019.html)
+# Openstack support dropped
+glance                  2012.1.1-5              2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+horizon                 2012.1.1-10             2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+keystone                2012.1.1-13+wheezy1     2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+nova                    2012.1.1-18             2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+python-keystoneclient   2012.1-3+deb7u1         2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+python-novaclient       1:2012.1-4              2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+swift                   1.4.8-2+deb7u1          2016-02-06  Not supported in Debian LTS (https://lists.debian.org/debian-lts/2015/11/msg00024.html)
+# End Openstack support dropped
diff -Nru debian-security-support-2015.04.04/security-support-ended.deb8 debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb8
--- debian-security-support-2015.04.04/security-support-ended.deb8	2014-12-08 22:18:43.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb8	2016-05-10 09:45:37.000000000 +0200
@@ -1,11 +1,13 @@
 
-# List of packages where security support has ended
+# List of packages whose security support ends before the distribution EOL
 
 # File format: Columns, separated by one or more space characters
 # 1. source package name
 # 2. last version with support
 #    Important: If there have been binNMUs, enter the highest version
 #    number used
-# 3. Date when support ended, in the form YYYY-mm-dd
+# 3. Date when support ended or will end, in the form YYYY-mm-dd
 # 4. Descriptive text or URL with more details (optional)
 #    In the program's output, this is prefixed with "Details:"
+
+tomcat6                  6.0.41-3                2016-12-31  https://lists.debian.org/debian-java/2016/01/msg00069.html
diff -Nru debian-security-support-2015.04.04/security-support-ended.deb9 debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb9
--- debian-security-support-2015.04.04/security-support-ended.deb9	1970-01-01 01:00:00.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/security-support-ended.deb9	2016-05-10 09:45:37.000000000 +0200
@@ -0,0 +1,13 @@
+
+# List of packages whose security support ends before the distribution EOL
+
+# File format: Columns, separated by one or more space characters
+# 1. source package name
+# 2. last version with support
+#    Important: If there have been binNMUs, enter the highest version
+#    number used
+# 3. Date when support ended or will end, in the form YYYY-mm-dd
+# 4. Descriptive text or URL with more details (optional)
+#    In the program's output, this is prefixed with "Details:"
+
+tomcat6                  6.0.45+dfsg-1           2016-12-31  https://lists.debian.org/debian-java/2016/01/msg00069.html
diff -Nru debian-security-support-2015.04.04/security-support-limited debian-security-support-2016.05.09+nmu1~deb8u1/security-support-limited
--- debian-security-support-2015.04.04/security-support-limited	2015-04-06 18:59:36.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/security-support-limited	2016-05-10 09:45:37.000000000 +0200
@@ -20,7 +20,10 @@
 ocsinventory-server Only supported behind an authenticated HTTP zone
 pidgin          Support in squeeze is limited to IRC, Jabber/XMPP, Sametime and SIMPLE
 qtwebkit        No security support upstream and backports not feasible, only for use on trusted content
+qtwebkit-opensource-src No security support upstream and backports not feasible, only for use on trusted content
 sql-ledger      Only supported behind an authenticated HTTP zone
 webkitgtk       No security support upstream and backports not feasible, only for use on trusted content
+wine-gecko-2.21 Not covered by security support, see https://bugs.debian.org/804058
+wine-gecko-2.24 Not covered by security support, see https://bugs.debian.org/804058
 xulrunner       Xulrunner was added in Wheezy 7.8 to fix build failures since Iceweasel 31 no longer provides a Xul lib. It's not covered by security support
 
diff -Nru debian-security-support-2015.04.04/t/check-support-status.t debian-security-support-2016.05.09+nmu1~deb8u1/t/check-support-status.t
--- debian-security-support-2015.04.04/t/check-support-status.t	2014-10-26 18:40:01.000000000 +0100
+++ debian-security-support-2016.05.09+nmu1~deb8u1/t/check-support-status.t	2016-05-10 09:48:45.000000000 +0200
@@ -101,6 +101,7 @@
 
     my $self = {
         'DIR' => $temp,
+        'EARLYEND' => $list_ended,
         'ENDED' => $list_ended,
         'LIMITED' => $list_limited,
         'DPKG-VERSION' => $dpkg_version,
@@ -129,6 +130,7 @@
     my $statusdb_file = "$temp/status-db";
 
     return (
+        # TODO: sym link EARLYEND to ENDED?
         $self->{'ENDED'},
         $self->{'LIMITED'},
         $query_list,
@@ -152,6 +154,7 @@
     my $vars = {
         'DPKG_QUERY' => 't/data/dpkg-query',
         'AWK' => "/usr/bin/$awk",
+        'EARLYEND' => $self->{'EARLYEND'},
         'ENDED' => $self->{'ENDED'},
         'LIMITED' => $self->{'LIMITED'},
     };
@@ -205,6 +208,7 @@
 iceweasel       3.5.16-20       2013-05-01
 base-files      6.0squeeze9     2014-05-01  Some spaced  explanation
 debconf         1.5.36.0        2014-05-02
+openjdk-6       6b35-1.13.7-1~deb7u1    2213-05-23  No perpetual term support
 __EOS__
     write_file ($list_limited, <<__EOS__);
 php5    See README.Debian.security for the PHP security policy
@@ -216,6 +220,7 @@
             [ 'ioi', 'debconf', '1.5.36.1' ],
             [ 'ioi', 'debconf-i18n', '1.5.36.1', 'debconf' ],
             [ 'ioi', 'php5', '5.3.3-7+squeeze19' ],
+            [ 'ioi', 'openjdk-6-jre', '6b35-1.13.7-1~deb7u1', 'openjdk-6' ],
         ],
     );
 
@@ -238,6 +243,12 @@
   Details: See README.Debian.security for the PHP security policy
   Affected binary package:
   - php5 (installed version: 5.3.3-7+squeeze19)
+
+
+* Source:openjdk-6, will end on 2213-05-23
+  Details: No perpetual term support
+  Affected binary package:
+  - openjdk-6-jre (installed version: 6b35-1.13.7-1~deb7u1)
 __EOS__
     eq_or_diff (
         $stdout,
@@ -250,6 +261,7 @@
         my $expect = <<__EOS__;
 base-files/6.0squeeze9
 php5/5.3.3-7+squeeze19
+openjdk-6-jre/6b35-1.13.7-1~deb7u1
 __EOS__
         eq_or_diff (
             $got,
@@ -732,6 +744,70 @@
         );
     }
 }
+
+diag ('early end support checks');
+
+foreach my $awk (@AWKs) {
+    diag ("Early end ($awk)");
+
+    my $tb = Testbed->new ($dpkg_version);
+    my ($list_ended, $list_limited, $query_list, $statusdb_file) = $tb->files;
+    my $exe = $tb->exe (
+        $awk,
+        [
+            '--type', 'earlyend',
+            '--no-heading',
+            '--list', $list_ended,
+            '--status-db', $statusdb_file,
+        ],
+    );
+
+    write_file ($list_ended, <<__EOS__);
+iceweasel       3.5.16-20       2013-05-01
+base-files      6.0squeeze9     2014-05-01  Some spaced  explanation
+debconf         1.5.36.0        2014-05-02
+openjdk-6       6b35-1.13.7-1~deb7u1    2213-05-23  No perpetual term support
+__EOS__
+    mock_query_list (
+        $query_list,
+        [
+            [ 'ioi', 'base-files', '6.0squeeze9' ],
+            [ 'ioi', 'debconf', '1.5.36.1' ],
+            [ 'ioi', 'debconf-i18n', '1.5.36.1', 'debconf' ],
+            [ 'ioi', 'openjdk-6-jre', '6b35-1.13.7-1~deb7u1', 'openjdk-6' ],
+        ],
+    );
+
+    # run a first time
+    my $run = Test::Command->new ('cmd' => $exe);
+    $run->run;
+    $run->exit_is_num (0);
+
+    my ($stdout, $stderr) = stdout_n_stderr ($run);
+    $stderr and diag ("stderr:\n" . $stderr);
+    my $expect_stdout = <<__EOS__;
+
+* Source:openjdk-6, will end on 2213-05-23
+  Details: No perpetual term support
+  Affected binary package:
+  - openjdk-6-jre (installed version: 6b35-1.13.7-1~deb7u1)
+__EOS__
+    eq_or_diff (
+        $stdout,
+        $expect_stdout,
+        'stdout'
+    );
+
+    if (ok (-f $statusdb_file, 'status db file was created')) {
+        my $got = read_file ($statusdb_file);
+        my $expect = "openjdk-6-jre/6b35-1.13.7-1~deb7u1\n";
+        eq_or_diff (
+            $got,
+            $expect,
+            'status db file content',
+        );
+    }
+}
 
 
 done_testing;
diff -Nru debian-security-support-2015.04.04/template-vars debian-security-support-2016.05.09+nmu1~deb8u1/template-vars
--- debian-security-support-2015.04.04/template-vars	2014-09-07 11:46:35.000000000 +0200
+++ debian-security-support-2016.05.09+nmu1~deb8u1/template-vars	2016-05-10 09:52:03.000000000 +0200
@@ -1,5 +1,5 @@
 define DPKG=dpkg
 define DPKG_QUERY=dpkg-query
 define AWK=awk
-define ENDED=/usr/share/debian-security-support/security-support-ended
+define ENDED=/usr/share/debian-security-support/security-support-ended.deb"$DEBIAN_VERSION"
 define LIMITED=/usr/share/debian-security-support/security-support-limited

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Version: 8.6

The updates referred to in each of these bugs were included in today's
stable point release.

Regards,

Adam

--- End Message ---

Reply to: