Hack to work around fpaste bugs

1 files changed, 36 insertions, 6 deletions

diff --git a/rpm-verify.sh b/rpm-verify.sh
index 4ab9cd1..59b99d7 100755
--- a/rpm-verify.sh
+++ b/rpm-verify.sh
@@ -12,6 +12,7 @@ if [ "$(/usr/bin/whoami)" != "root" ]; then
   exit 1
 fi
 
+echo "Updating prelink info ..."
 [ -f /etc/sysconfig/prelink ] \
   && . /etc/sysconfig/prelink \
   && /usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink/prelink.log 2>&1
@@ -20,20 +21,49 @@ fi
 
 echo "This may take 7.5mins or longer, please wait ... (Might be a good time for coffee)"
 time /bin/rpm -Va > ${TMPDIR}/RPM-VA2_${DS}.txt 2>&1
+echo "Generating reports ..."
 /bin/egrep -v '^.{9}  (c /|  /lib/modules/.*/modules\.|  /usr/src/kernels/)' ${TMPDIR}/RPM-VA2_${DS}.txt > ${TMPDIR}/URGENT-REVIEW_${DS}.txt
 /bin/egrep '^.{9}  c /' ${TMPDIR}/RPM-VA2_${DS}.txt > ${TMPDIR}/REVIEW-CONFIGS_${DS}.txt
 /bin/find /etc -name '*.rpm?*' > ${TMPDIR}/REVIEW-OBSOLETE-CONFIGS_${DS}.txt
+
+if [ -x /usr/sbin/semanage ]; then
+  echo "Reporting SELinux policy ..."
+  /usr/sbin/semanage -o ${TMPDIR}/SELINUX-CUSTOM-CONFIG_${DS}.txt
+fi
+
+if [ -x /usr/bin/rpmdev-rmdevelrpms ]; then
+  echo "Reporting devel packages"
+  /usr/bin/rpmdev-rmdevelrpms -l > ${TMPDIR}/SHOW-DEVELRPMS_${DS}.txt
+fi
+
+echo "Finding installed packages ..."
 if [ -x /usr/bin/show-installed ]; then
 /usr/bin/show-installed -f kickstart -e -o ${TMPDIR}/SHOW-INSTALLED2_${DS}.txt
 else
 $(dirname $0)/show-installed -f kickstart -e -o ${TMPDIR}/SHOW-INSTALLED2_${DS}.txt
 fi
+/bin/sort -o ${TMPDIR}/SHOW-INSTALLED2_${DS}.txt ${TMPDIR}/SHOW-INSTALLED2_${DS}.txt
+
+cat - <<EOT
+==========
+TMPDIR = ${TMPDIR}
+==========
+##### The following all break fpaste, so concatenate below instead:
+#/usr/bin/fpaste ${TMPDIR}/[A-Z]*_${DS}.txt
+## (excluding ${TMPDIR}/RPM-VA2_${DS}.txt to avoid duplicate info)
+#/usr/bin/fpaste ${TMPDIR}/{REVIEW,SHOW,URGENT}*_${DS}.txt
+==========
+EOT
 
-echo "=========="
-echo "TMPDIR = ${TMPDIR}"
-echo "fpaste ${TMPDIR}/{REVIEW,SHOW,URGENT}*_${DS}.txt"
-echo "excluding ${TMPDIR}/RPM-VA2_${DS}.txt to work around a bug"
-echo "=========="
-/usr/bin/fpaste ${TMPDIR}/{REVIEW,SHOW,URGENT}*_${DS}.txt
+for fp in ${TMPDIR}/{REVIEW,SELINUX,SHOW,URGENT}*_${DS}.txt; do
+  cat - >> ${TMPDIR}/fpaste-output_${DS}.txt <<EOT
+===============================================================================
+===== $fp
+===============================================================================
+EOT
+  cat $fp >> ${TMPDIR}/fpaste-output_${DS}.txt
+done
+echo fpaste ${TMPDIR}/fpaste-output_${DS}.txt
+/usr/bin/fpaste ${TMPDIR}/fpaste-output_${DS}.txt
 
 #EOF