Skip to content

Commit ef0a28a

Browse files
authored
refresh patches when building Debian packages, to prevent fuzz (#2143)
1 parent db2ff32 commit ef0a28a

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.evergreen/scripts/debian_package_build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export DEBOOTSTRAP_DIR=$(pwd)/debootstrap.git
5050
sudo -E ./debootstrap.git/debootstrap --variant=buildd unstable ./unstable-chroot/ http://cdn-aws.deb.debian.org/debian
5151
cp -a mongoc ./unstable-chroot/tmp/
5252
sudo chroot ./unstable-chroot /bin/bash -c '(\
53-
apt-get install -y build-essential git-buildpackage fakeroot dpkg-dev debhelper cmake libssl-dev pkgconf python3-sphinx python3-sphinx-design furo libmongocrypt-dev zlib1g-dev libsasl2-dev libsnappy-dev libutf8proc-dev libzstd-dev libjs-mathjax python3-packaging && \
53+
apt-get install -y build-essential quilt git-buildpackage fakeroot dpkg-dev debhelper cmake libssl-dev pkgconf python3-sphinx python3-sphinx-design furo libmongocrypt-dev zlib1g-dev libsasl2-dev libsnappy-dev libutf8proc-dev libzstd-dev libjs-mathjax python3-packaging && \
5454
chown -R root:root /tmp/mongoc && \
5555
cd /tmp/mongoc && \
5656
git clean -fdx && \
@@ -62,6 +62,8 @@ sudo chroot ./unstable-chroot /bin/bash -c '(\
6262
git checkout upstream/debian/unstable && \
6363
git checkout ${CURRENT_BRANCH} && \
6464
git checkout upstream/debian/unstable -- ./debian/ && \
65+
QUILT_PATCHES="debian/patches" quilt push -a --refresh && \
66+
QUILT_PATCHES="debian/patches" quilt pop -a && rm -rf .pc/ && \
6567
git commit -m "fetch debian directory from the debian/unstable branch" && \
6668
LANG=C /bin/bash ./debian/build_snapshot.sh && \
6769
debc ../*.changes && \
@@ -88,7 +90,7 @@ sudo chroot ./unstable-chroot /bin/bash -c "(\
8890
sudo -E ./debootstrap.git/debootstrap --variant=buildd --arch i386 unstable ./unstable-i386-chroot/ http://cdn-aws.deb.debian.org/debian
8991
cp -a mongoc ./unstable-i386-chroot/tmp/
9092
sudo chroot ./unstable-i386-chroot /bin/bash -c '(\
91-
apt-get install -y build-essential git-buildpackage fakeroot dpkg-dev debhelper cmake libssl-dev pkgconf python3-sphinx python3-sphinx-design furo libmongocrypt-dev zlib1g-dev libsasl2-dev libsnappy-dev libutf8proc-dev libzstd-dev libjs-mathjax && \
93+
apt-get install -y build-essential quilt git-buildpackage fakeroot dpkg-dev debhelper cmake libssl-dev pkgconf python3-sphinx python3-sphinx-design furo libmongocrypt-dev zlib1g-dev libsasl2-dev libsnappy-dev libutf8proc-dev libzstd-dev libjs-mathjax && \
9294
chown -R root:root /tmp/mongoc && \
9395
cd /tmp/mongoc && \
9496
git clean -fdx && \
@@ -101,6 +103,8 @@ sudo chroot ./unstable-i386-chroot /bin/bash -c '(\
101103
git checkout ${CURRENT_BRANCH} && \
102104
git checkout upstream/debian/unstable -- ./debian/ && \
103105
git commit -m "fetch debian directory from the debian/unstable branch" && \
106+
QUILT_PATCHES="debian/patches" quilt push -a --refresh && \
107+
QUILT_PATCHES="debian/patches" quilt pop -a && rm -rf .pc/ && \
104108
LANG=C /bin/bash ./debian/build_snapshot.sh && \
105109
debc ../*.changes && \
106110
dpkg -i ../*.deb && \

0 commit comments

Comments
 (0)