Re: mail/mblaze version fix
On Mon, Mar 30, 2020 at 01:30:44PM +, Lucas wrote: > Agree this is hackish at the very least, but for the time being this is > the only thing we have. Upstream already fixed it and put some effort > to make this less frequent in the future. Still, haven't rolled out any > release yet, and isn't sure if a release is justified already. Afterall this shifts maintainence burden from upstream to downstream; no matter what they do, as long as there's no new release, we have to work things around. I'm not saying this in order to keep mblaze broken, but our manpower is very limited and approaches like generally don't help improving the situation. > While discussing the proposed patch, Leah pointed me out that > SOURCE_DATE_EPOCH is a convention [0]. Attached patch changes the value > to 0, which, althought it isn't exactly compliant, it prevents the port > for changing values in the package after every build. Sounds good, I'll commit that regardless of the release issue, thanks. > The post-extract: chunk can be left out for being too hackish, but I > consider the rest of the changes should be merged. Agreed.
Re: mail/mblaze version fix
On 2020/03/30 13:30, Lucas wrote: > While discussing the proposed patch, Leah pointed me out that > SOURCE_DATE_EPOCH is a convention [0]. Attached patch changes the value > to 0, which, althought it isn't exactly compliant, it prevents the port > for changing values in the package after every build. OpenBSD isn't trying to do "reproducible builds" so I'm not sure there is much point in this part of the diff.
Re: mail/mblaze version fix
Klemens Nanni wrote:
> Upstream has to fix this with a proper release: roll out 0.6.1 or so and
> have all downstreams package a new and fixed version.
Agree this is hackish at the very least, but for the time being this is
the only thing we have. Upstream already fixed it and put some effort
to make this less frequent in the future. Still, haven't rolled out any
release yet, and isn't sure if a release is justified already.
While discussing the proposed patch, Leah pointed me out that
SOURCE_DATE_EPOCH is a convention [0]. Attached patch changes the value
to 0, which, althought it isn't exactly compliant, it prevents the port
for changing values in the package after every build.
The post-extract: chunk can be left out for being too hackish, but I
consider the rest of the changes should be merged.
-Lucas
[0]: https://reproducible-builds.org/specs/source-date-epoch/
Index: Makefile
===
RCS file: /home/cvs/ports/mail/mblaze/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile9 Feb 2020 21:55:04 - 1.9
+++ Makefile30 Mar 2020 13:27:44 -
@@ -3,6 +3,7 @@
COMMENT = set of Maildir utilities
DISTNAME = mblaze-0.6
+REVISION = 0
CATEGORIES = mail
HOMEPAGE = https://git.vuxu.org/mblaze/
@@ -12,13 +13,15 @@ MAINTAINER =Lucas
# Public domain
PERMIT_PACKAGE = Yes
-MASTER_SITES = https://git.vuxu.org/mblaze/snapshot/
+MASTER_SITES = https://leahneukirchen.org/releases/
WANTLIB = c iconv pthread
LIB_DEPENDS = converters/libiconv
USE_GMAKE =Yes
MAKE_FILE =GNUmakefile
+# Don't include build date in museragent
+MAKE_ENV +=SOURCE_DATE_EPOCH=0
MAKE_FLAGS = LOCALBASE="${LOCALBASE}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
LDLIBS="-L${LOCALBASE}/lib -liconv -pthread"
@@ -26,5 +29,10 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \
MANDIR="${PREFIX}/man"
TEST_TARGET = check
+
+# XXX remove after next release
+# Fix version
+post-extract:
+ echo 0.6 >${WRKSRC}/VERSION
.include
Re: mail/mblaze version fix
On Mon, Mar 30, 2020 at 12:12:57PM +, Lucas wrote:
> Leah forgot to bump VERSION in released mblaze, so fix that in order to
> stop museragent reporting mblaze/0.5.1, as you can see in the
> User-Agent: header for this very email.
> @@ -26,5 +30,10 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \
> MANDIR="${PREFIX}/man"
>
> TEST_TARGET =check
> +
> +# XXX remove after next release
> +# Fix version
> +post-extract:
> + echo 0.6 >${WRKSRC}/VERSION
This hacks it up for us, but all other downstreams are still effected.
Upstream has to fix this with a proper release: roll out 0.6.1 or so and
have all downstreams package a new and fixed version.
mail/mblaze version fix
Hello,
Leah forgot to bump VERSION in released mblaze, so fix that in order to
stop museragent reporting mblaze/0.5.1, as you can see in the
User-Agent: header for this very email.
While at that, don't include the build date in museragent, and change
MASTER_SITES to the official release page.
-Lucas
Index: Makefile
===
RCS file: /home/cvs/ports/mail/mblaze/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile9 Feb 2020 21:55:04 - 1.9
+++ Makefile30 Mar 2020 12:05:25 -
@@ -3,6 +3,7 @@
COMMENT = set of Maildir utilities
DISTNAME = mblaze-0.6
+REVISION = 0
CATEGORIES = mail
HOMEPAGE = https://git.vuxu.org/mblaze/
@@ -12,13 +13,16 @@ MAINTAINER =Lucas
# Public domain
PERMIT_PACKAGE = Yes
-MASTER_SITES = https://git.vuxu.org/mblaze/snapshot/
+MASTER_SITES = https://leahneukirchen.org/releases/
+
WANTLIB = c iconv pthread
LIB_DEPENDS = converters/libiconv
USE_GMAKE =Yes
MAKE_FILE =GNUmakefile
+# Don't include build date in museragent
+MAKE_ENV +=SOURCE_DATE_EPOCH=no_build_date
MAKE_FLAGS = LOCALBASE="${LOCALBASE}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
LDLIBS="-L${LOCALBASE}/lib -liconv -pthread"
@@ -26,5 +30,10 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \
MANDIR="${PREFIX}/man"
TEST_TARGET = check
+
+# XXX remove after next release
+# Fix version
+post-extract:
+ echo 0.6 >${WRKSRC}/VERSION
.include
