Eggdrop v1.9.1 *STABLE*

[vanosg]

No description provided.

[tianon]

+RUN sed -i -e 's/^root::/root:!:/' /etc/shadow

This is a little eyebrow-raising. I'm guessing this is related to your query on IRC around that bogus CVE? See #5880 where we made this part of our tests, so if any of the images actually had this today, our tests (and thus the CI on PRs) would be failing.

[vanosg]

Precisely. Since there appears to be no way to contest it as a CVE (so frustrating, like you said its bogus), I figured I'd add that to remove any future temptation to claim it against new images. I'm 110% open to other suggestions or changes, to include removal... just don't want some other "enterprising" individual to try it again

[tianon]

I used https://cveform.mitre.org/ to dispute some of the previous ones -- I never got a response, but they did remove/dispute/reject some of the CVEs, so it might be worth a try.

[github-actions]

Diff for 7c04543:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index c36bd75..e8b63a7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -5,12 +5,12 @@ Tags: 1.8, 1.8.4
 GitCommit: 14411e45f599536a86d9f023c0fa09f3dd2f5454
 Directory: 1.8
 
-Tags: 1.9, 1.9.0, stable, latest
+Tags: 1.9, 1.9.1, stable, latest
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: f65a97bc6d85e74d1094f1d75c7979aec53cb4fa
+GitCommit: eb6827278e290bc9ae5d443adfac3ca153d1c459
 Directory: 1.9
 
 Tags: develop
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: f65a97bc6d85e74d1094f1d75c7979aec53cb4fa
+GitCommit: 8d3bb9a0a2f35b45d50b82e9c7dd7a5af66e4c9a
 Directory: develop
diff --git a/_bashbrew-list b/_bashbrew-list
index 9690e19..d9d8d5d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 eggdrop:1.8
 eggdrop:1.8.4
 eggdrop:1.9
-eggdrop:1.9.0
+eggdrop:1.9.1
 eggdrop:develop
 eggdrop:latest
 eggdrop:stable
diff --git a/eggdrop_develop/Dockerfile b/eggdrop_develop/Dockerfile
index f5a42d0..bf85146 100644
--- a/eggdrop_develop/Dockerfile
+++ b/eggdrop_develop/Dockerfile
@@ -6,8 +6,8 @@ RUN adduser -S eggdrop
 # grab su-exec for easy step-down from root
 RUN apk add --no-cache 'su-exec>=0.2'
 
-ENV EGGDROP_SHA256 ef482116819630aa65127d1c3d04e3762cbf45827bc66d7d505d481960209448
-ENV EGGDROP_COMMIT d7729c4bbfb30e831e879da3985832e1db503dff
+ENV EGGDROP_SHA256 f977f8f586d1b65d2bae581b5b5828d79193a29a217f617c4c74d1868a566c7f
+ENV EGGDROP_COMMIT 886c2ff6f943952018000c16cb48c08b8ab99127
 
 RUN apk --update add --no-cache tcl bash openssl
 RUN apk --update add --no-cache --virtual egg-deps tcl-dev wget ca-certificates make tar gpgme build-base openssl-dev \
diff --git a/eggdrop_develop/entrypoint.sh b/eggdrop_develop/entrypoint.sh
index fa71261..3c0e126 100755
--- a/eggdrop_develop/entrypoint.sh
+++ b/eggdrop_develop/entrypoint.sh
@@ -78,7 +78,7 @@ EOS
     sed -i \
       -e "/set nick \"Lamestbot\"/c\set nick \"$NICK\"" \
       -e "/another.example.com 7000:password/d" \
-      -e "/you.need.to.change.this 6667/c\addserver ${SERVER}" \
+      -e "/you.need.to.change.this 6667/c\server add ${SERVER}" \
       -e "/#listen 3333 all/c\listen ${LISTEN} all" \
       -e "s/^#set dns-servers/set dns-servers/" \
       -e "/#set owner \"MrLame, MrsLame\"/c\set owner \"${OWNER}\"" \
diff --git a/eggdrop_latest/Dockerfile b/eggdrop_latest/Dockerfile
index 220e400..ccc7b94 100644
--- a/eggdrop_latest/Dockerfile
+++ b/eggdrop_latest/Dockerfile
@@ -8,21 +8,21 @@ RUN apk add --no-cache 'su-exec>=0.2'
 
 RUN apk add --no-cache tcl bash openssl
 RUN apk add --no-cache --virtual egg-deps tcl-dev wget ca-certificates make tar gpgme build-base openssl-dev \
-  && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.0.tar.gz \
-  && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.0.tar.gz.asc \
+  && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.1.tar.gz \
+  && wget ftp://ftp.eggheads.org/pub/eggdrop/source/1.9/eggdrop-1.9.1.tar.gz.asc \
   && gpg --keyserver ha.pool.sks-keyservers.net --recv-key E01C240484DE7DBE190FE141E7667DE1D1A39AFF \
-  && gpg --batch --verify eggdrop-1.9.0.tar.gz.asc eggdrop-1.9.0.tar.gz \
+  && gpg --batch --verify eggdrop-1.9.1.tar.gz.asc eggdrop-1.9.1.tar.gz \
   && command -v gpgconf > /dev/null \
   && gpgconf --kill all \
-  && rm eggdrop-1.9.0.tar.gz.asc \
-  && tar -zxvf eggdrop-1.9.0.tar.gz \
-  && rm eggdrop-1.9.0.tar.gz \
-  && ( cd eggdrop-1.9.0 \
+  && rm eggdrop-1.9.1.tar.gz.asc \
+  && tar -zxvf eggdrop-1.9.1.tar.gz \
+  && rm eggdrop-1.9.1.tar.gz \
+  && ( cd eggdrop-1.9.1 \
     && ./configure \
     && make config \
     && make \
     && make install DEST=/home/eggdrop/eggdrop ) \
-  && rm -rf eggdrop-1.9.0 \
+  && rm -rf eggdrop-1.9.1 \
   && mkdir /home/eggdrop/eggdrop/data \
   && chown -R eggdrop /home/eggdrop/eggdrop \
   && apk del egg-deps