custom-scripts/scripts-multi-distro-upgrade/pre_remove_exceptions_multi-distro-upgrade

@@ -12,6 +12,12 @@ case ${PIUPARTS_OBJECTS} in
 		log_debug
 		touch /var/log/autotrust/dummy.log
 		;;
+	chef-solr=None)
+		# removed after wheezy
+		# logrotate config references /var/log/chef/solr.log
+		log_debug
+		touch /var/log/chef/solr.log
+		;;
 	dancer-ircd=None)
 		# removed after wheezy
 		# logrotate config references /var/log/dancer-ircd/ircd.log

custom-scripts/scripts/is_testable_uninstallable

@@ -58,6 +58,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "lenny" ]; then
 		dnscache-run)
 			skip_distupgrade "#664848: breaks dns resolution in chroot"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient-basic"
+			;;
 		libpils0|\
 		libpils-dev|\
 		libstonith0|\
@@ -109,6 +113,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "squeeze" ]; then
 			# removed after squeeze
 			skip_distupgrade "#595593: fails to install"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
+			;;
 		mini-buildd-bld|\
 		mini-buildd-rep)
 			skip_distupgrade "#632955, #656746: time limit exceeded during install"
@@ -127,6 +135,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "wheezy" ]; then
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
+		libdbd-oracle-perl|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
+			;;
 		nautilus-dropbox)
 			skip_distupgrade "#770402: downloads awfully slow, hangs during installation"
 			;;
@@ -137,6 +149,9 @@ fi
 if [ "${PIUPARTS_DISTRIBUTION}" = "jessie" ]; then
 
 	case ${PIUPARTS_OBJECTS%%=*} in
+		fusionforge-plugin-mediawiki)
+			skip_distupgrade "#929139: fusionforge-plugin-mediawiki: uninstallable cruft package"
+			;;
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
@@ -156,6 +171,36 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "stretch" ]; then
 		geoip-database-contrib)
 			skip_distupgrade "#885441: download location no longer available"
 			;;
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym|\
+		ora2pg)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
+		llvm-3.7-examples)
+			skip_distupgrade "#929138: uninstallable on !arm*"
+			;;
+	esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "buster" ]; then
+
+	case ${PIUPARTS_OBJECTS%%=*} in
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
+	esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "sid" ]; then
+
+	case ${PIUPARTS_OBJECTS%%=*} in
+		libdbd-oracle-perl|\
+		libdbd-oracle-perl-dbgsym)
+			skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+			;;
 	esac
 
 fi

custom-scripts/scripts/post_remove_exceptions

@@ -21,4 +21,20 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
+	ibod|\
+	isdnactivecards|\
+	isdneurofile|\
+	isdnlog|\
+	isdnutils|\
+	isdnutils-xtools|\
+	isdnvbox|\
+	isdnvboxserver|\
+	INVALID)
+		case "$PIUPARTS_DISTRIBUTION" in
+			lenny|squeeze)
+				#431855: isdnutils-base fails to purge with "There are still files in /etc/isdn/ that you may want to remove manually."
+				log_debug
+				rm -fv /etc/isdn/*
+		esac
+		;;
 esac

custom-scripts/scripts/pre_install_exceptions

@@ -259,8 +259,10 @@ if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
 			;;
 		ipppd|ibod|isdnutils)
 			#542156
+			if [ ! -e /dev/MAKEDEV ]; then
 				log_debug
-			test -e /dev/MAKEDEV || ln -sfv /sbin/MAKEDEV /dev/MAKEDEV
+				ln -sfv /sbin/MAKEDEV /dev/MAKEDEV
+			fi
 			;;
 	esac
 

custom-scripts/scripts/pre_remove_exceptions

@@ -25,18 +25,20 @@ case ${PIUPARTS_OBJECTS%%=*} in
 				;;
 		esac
 		;;
-	isdnlog|isdnutils)
-		#WORKSAROUND #431855: fails with "There are still files in /etc/isdn/ that you may want to remove manually."
-		if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
+	freebsd-buildutils)
+		case "$PIUPARTS_DISTRIBUTION" in
+			lenny|squeeze)
+				# apt considers original-awk as essential
 				log_debug
-			rm -fv /etc/isdn/*
-		fi
+				apt-get -y remove freebsd-buildutils
+				echo 'Yes, do as I say!' | apt-get -y --force-yes remove original-awk
+		esac
 		;;
 	original-awk)
 		case "$PIUPARTS_DISTRIBUTION" in
-			lenny)
+			lenny|squeeze)
+				# apt considers original-awk as essential
 				log_debug
-				# apt considers this as essential
 				echo 'Yes, do as I say!' | apt-get -y --force-yes remove original-awk
 		esac
 		;;

debian/changelog

@@ -5,9 +5,13 @@ piuparts (1.0.1) UNRELEASED; urgency=medium
     - Add '--max-command-output-size' option to allow overriding the default
       of 8 MB for debugging runs.
     - Run pre_remove scripts before computing packages to be removed.
+  * piuparts.conf.anbe: Add some more example sections.
   * piuparts-slave.py:
     - Generate separate tarball names for --merged-usr chroots.
 
+  [ Holger Levsen ]
+  * generate_daily_report: improve statistics.
+
  -- Holger Levsen <holger@debian.org>  Sat, 04 May 2019 21:53:16 +0200
 
 piuparts (1.0.0) unstable; urgency=medium

master-bin/generate_daily_report.in

@@ -82,7 +82,8 @@ for SECTION in $SECTIONS ; do
 		-type f -name '*.log' -newer $FAILURESTAMP -exec ls -1 {} + 2>/dev/null
 done | sed s#^$MASTER#$URLBASE# >> $DAILYTMP
 
-echo "$(cat $DAILYTMP | wc -l) new failures:" >> $DAILYREPORT
+echo -n "$(cat $DAILYTMP | wc -l) new failures in total, " >> $DAILYREPORT
+echo "$(cat $DAILYTMP | (egrep "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) | wc -l) new failures sid, $TESTING and testing2sid:" >> $DAILYREPORT
 # show failures (and show failures in sid, $TESTING and testing2sid first
 cat $DAILYTMP | (egrep "/(sid|$TESTING|testing2sid)/" 2>/dev/null || true) >> $DAILYREPORT
 echo >> $DAILYREPORT

piupartslib/packagesdb.py

@@ -302,6 +302,13 @@ class PackagesDB:
     _ignored_missing_dependencies = [
         "kbdcontrol",
         "vidcontrol",
+        "oracle-instantclient-basic",
+        "oracle-instantclient11.2-basic",
+        "oracle-instantclient12.1-basic",
+        # jessie
+        "mediawiki",
+        # stretch
+        "llvm-3.7-dev",
     ]
 
     # keep in sync with piuparts-report.py: emphasize_reason()