Support Ubuntu 13.10 measurements

diff --git a/src/libimcv/imv/data.sql b/src/libimcv/imv/data.sql
index 4d70878457a8bbad5bfa52128e5065c6d23d972f..81c5b0daf034b7c215b612b1907b07ea1f1dad02 100644 (file)
--- a/src/libimcv/imv/data.sql
+++ b/src/libimcv/imv/data.sql
@@ -132,6 +132,18 @@ INSERT INTO products (                     /* 22 */
  'Android 4.2.1'
 );
 
+INSERT INTO products (                 /* 23 */
+  name
+) VALUES (
+ 'Ubuntu 13.10 i686'
+);
+
+INSERT INTO products (                 /* 24 */
+  name
+) VALUES (
+ 'Ubuntu 13.10 x86_64'
+);
+
 /* Directories */
 
 INSERT INTO directories (              /*  1 */
@@ -612,6 +624,12 @@ INSERT INTO groups_product_defaults (
   6, 19
 );
 
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
+  6, 23
+);
+
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (
@@ -654,6 +672,12 @@ INSERT INTO groups_product_defaults (
   7, 20
 );
 
+INSERT INTO groups_product_defaults (
+  group_id, product_id
+) VALUES (
+  7, 24
+);
+
 INSERT INTO groups_product_defaults (
   group_id, product_id
 ) VALUES (

diff --git a/src/libimcv/plugins/imv_os/pacman.sh b/src/libimcv/plugins/imv_os/pacman.sh
index e99de0cb54950ecb3db2e27aa8b264785a04c27f..621905edfdf14ac32ce2b82243debd3804606ef4 100755 (executable)
--- a/src/libimcv/plugins/imv_os/pacman.sh
+++ b/src/libimcv/plugins/imv_os/pacman.sh
@@ -3,7 +3,7 @@
 DIR="/etc/pts"
 DATE=`date +%Y%m%d-%H%M`
 UBUNTU="http://security.ubuntu.com/ubuntu/dists"
-UBUNTU_VERSIONS="raring quantal precise lucid"
+UBUNTU_VERSIONS="saucy raring quantal precise lucid"
 UBUNTU_DIRS="main multiverse restricted universe"
 UBUNTU_ARCH="binary-amd64 binary-i386"
 DEBIAN="http://security.debian.org/dists"
@@ -43,6 +43,27 @@ do
   done
 done
 
+for f in saucy-security/binary-amd64/*
+do
+  $PACMAN --product "Ubuntu 13.10 x86_64" --file $f --security >> $PACMAN_LOG
+done
+echo
+for f in saucy-updates/binary-amd64/*
+do
+  $PACMAN --product "Ubuntu 13.10 x86_64" --file $f >> $PACMAN_LOG
+done
+echo
+for f in saucy-security/binary-i386/*
+do
+  $PACMAN --product "Ubuntu 13.10 i686" --file $f --security >> $PACMAN_LOG
+done
+echo
+for f in saucy-updates/binary-i386/*
+do
+  $PACMAN --product "Ubuntu 13.10 i686" --file $f >> $PACMAN_LOG
+done
+echo
+
 for f in raring-security/binary-amd64/*
 do
   $PACMAN --product "Ubuntu 13.04 x86_64" --file $f --security >> $PACMAN_LOG