Merge pull request #72 from infosiftr/update

tianon · web-flow · commit 4396d784813e · 2021-10-06T16:50:33.000-07:00
Update to 1.6.12
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -6,8 +6,8 @@ RUN addgroup -g 11211 memcache && adduser -D -u 11211 -G memcache memcache
 # ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
 RUN apk add --no-cache libsasl
 
-ENV MEMCACHED_VERSION 1.6.10
-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec
+ENV MEMCACHED_VERSION 1.6.12
+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
 
 RUN set -x \
 	\
@@ -34,6 +34,9 @@ RUN set -x \
 	\
 	&& cd /usr/src/memcached \
 	\
+# https://github.com/docker-library/memcached/issues/71#issuecomment-937067759 🙈
+	&& sed -i -e '/cdefs/d' queue.h \
+	\
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-extstore \
diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -11,8 +11,8 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV MEMCACHED_VERSION 1.6.10
-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec
+ENV MEMCACHED_VERSION 1.6.12
+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01
 
 RUN set -x \
 	\

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ RUN addgroup -g 11211 memcache && adduser -D -u 11211 -G memcache memcache`
`6`	`6`	`# ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto`
`7`	`7`	`RUN apk add --no-cache libsasl`
`8`	`8`
`9`		`-ENV MEMCACHED_VERSION 1.6.10`
`10`		`-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec`
	`9`	`+ENV MEMCACHED_VERSION 1.6.12`
	`10`	`+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01`
`11`	`11`
`12`	`12`	`RUN set -x \`
`13`	`13`	`\`
`@@ -34,6 +34,9 @@ RUN set -x \`
`34`	`34`	`\`
`35`	`35`	`&& cd /usr/src/memcached \`
`36`	`36`	`\`
	`37`	`+# https://github.com/docker-library/memcached/issues/71#issuecomment-937067759 🙈`
	`38`	`+ && sed -i -e '/cdefs/d' queue.h \`
	`39`	`+ \`
`37`	`40`	`&& ./configure \`
`38`	`41`	`--build="$gnuArch" \`
`39`	`42`	`--enable-extstore \`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ RUN set -eux; \`
`11`	`11`	`; \`
`12`	`12`	`rm -rf /var/lib/apt/lists/*`
`13`	`13`
`14`		`-ENV MEMCACHED_VERSION 1.6.10`
`15`		`-ENV MEMCACHED_SHA1 cb5b9fe77a2a59cc6cc7103a415bc07df9ddc6ec`
	`14`	`+ENV MEMCACHED_VERSION 1.6.12`
	`15`	`+ENV MEMCACHED_SHA1 40d43e98f149e13e6c81eee813e6734f23413a01`
`16`	`16`
`17`	`17`	`RUN set -x \`
`18`	`18`	`\`