Defuzz fuzzy quilt patches and/or disable broken quilt patches

diff --git a/debian/patches/detect-raspbian.diff b/debian/patches/detect-raspbian.diff
index eec08b00f6c600ddf006899a8159b3baa879ceb1..93f776a7f8f2214d5deaca48c39161501717bac5 100644 (file)
--- a/debian/patches/detect-raspbian.diff
+++ b/debian/patches/detect-raspbian.diff
@@ -3,23 +3,23 @@ Description:  Add Raspbian to lists of "debian-like" distros.
  build failure in Raspbian.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
-diff --git a/install-deps.sh b/install-deps.sh
-index 3ba5e47ff..ad7f338e2 100755
---- a/install-deps.sh
-+++ b/install-deps.sh
-@@ -301,7 +301,7 @@ else
+Index: tempdefuzz/install-deps.sh
+===================================================================
+--- tempdefuzz.orig/install-deps.sh
++++ tempdefuzz/install-deps.sh
+@@ -340,7 +340,7 @@ else
      [ $WITH_ZBD ] && with_zbd=true || with_zbd=false
      source /etc/os-release
      case "$ID" in
 -    debian|ubuntu|devuan|elementary)
 +    debian|ubuntu|devuan|raspbian|elementary)
          echo "Using apt-get to install dependencies"
-         $SUDO apt-get install -y devscripts equivs
-         $SUDO apt-get install -y dpkg-dev
-diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
-index e0ea4f07d..0f30b0a40 100755
---- a/qa/workunits/ceph-helpers-root.sh
-+++ b/qa/workunits/ceph-helpers-root.sh
+       # Put this before any other invocation of apt so it can clean
+       # up in a broken case.
+Index: tempdefuzz/qa/workunits/ceph-helpers-root.sh
+===================================================================
+--- tempdefuzz.orig/qa/workunits/ceph-helpers-root.sh
++++ tempdefuzz/qa/workunits/ceph-helpers-root.sh
 @@ -35,7 +35,7 @@ function install() {
  
  function install_one() {
@@ -29,10 +29,10 @@ index e0ea4f07d..0f30b0a40 100755
              sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@"
              ;;
          centos|fedora|rhel)
-diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-index ca9b8d2ea..54a80b13b 100755
---- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-+++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+Index: tempdefuzz/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+===================================================================
+--- tempdefuzz.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ tempdefuzz/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
 @@ -19,7 +19,7 @@ CURRENT_PATH=`pwd`
  # install prerequisites
  # for rocksdb

diff --git a/debian/patches/series b/debian/patches/series
index 87edd69c2af28e0eb8a8aae46b8f580dcafccb25..416fa61b08cd4179e524514307fe26ce6e66a3aa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,9 @@
 enable-strsignal.patch
 update-java-source-target-flags.patch
 disable-crypto.patch
-# Ubuntu: civetweb max connections
 civetweb-755-1.8-somaxconn-configurable_conf.patch
 civetweb-755-1.8-somaxconn-configurable.patch
 civetweb-755-1.8-somaxconn-configurable_test.patch
-# Upstream: py3
-# Upstream: 32bit
 debian-armel-armhf-buildflags.patch
 fix-bash-completion-location
 32bit-fixes.patch