Felix Kronlage writes:
> hi.
>
> trivial update from 4.67 to exim 4.68 attached.
> Changelog for the exim changes is here:
> <url: http://www.exim.org/ftp/ChangeLogs/ChangeLog-4.68>
>
> please test and comment.
Works fine for me on i386 but the version number is still hardcoded to
4.66:
./pkg/PLIST:bin/exim-4.66
./patches/patch-scripts_exim_install:+ version=exim-4.66
I don't know why patch-scripts_exim_install was added by one of the
former maintainers. Without the patch the version number is set to
4.68-1 instead of 4.68. The number that follows the dash is the local
compilation number.
IMHO you could remove patch-scripts_exim_install. I think it's okay
to include the compilation number even if it will always equal 1.
Alternatively, here's a patch that excludes the compilation number
from the version without the need to hardcode the version into
patch-scripts_exim_install.
$OpenBSD$
--- scripts/exim_install.orig Thu Aug 30 16:31:06 2007
+++ scripts/exim_install Fri Sep 7 16:22:08 2007
@@ -219,7 +219,7 @@ while [ $# -gt 0 ]; do
if [ $name = exim${EXE} ]; then
version=exim-`./exim -bV -C /dev/null | \
- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
+ awk '/Exim version/ { OFS=""; print $3 }'`${EXE}
if [ "${version}" = "exim-${EXE}" ]; then
echo $com ""
But I'm wondering whether the versioned binary is needed at all.
Here's a patch that disables the special handling of the exim binary.
With this patch $LOCALBASE/bin/exim will be the binary itself instead
of a a symbolic link to the versioned binary. A nice side effect is
that you can run "make update-plist" without the need to fix the file
mode of the exim binary in PLIST.
$OpenBSD$
--- scripts/exim_install.orig Thu Aug 30 16:31:06 2007
+++ scripts/exim_install Fri Sep 7 16:07:28 2007
@@ -217,7 +217,7 @@ while [ $# -gt 0 ]; do
# The exim binary is handled specially
- if [ $name = exim${EXE} ]; then
+ if false; then
version=exim-`./exim -bV -C /dev/null | \
awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
The only difference that I can see is that the output of ps will no
longer show the version:
26814 ?? Is 0:00.00 /usr/local/bin/exim -bd -q30m
versus
2491 ?? Is 0:00.00 /usr/local/bin/exim -bd -q30m (exim-4.68)
